merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb

From: Mauro Carvalho Chehab <mchehab@infradead.org>



Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 14 insertions, 4 deletions

diff --git a/mailimport b/mailimport
index 2bcd2a09f..889193ec7 100755
--- a/mailimport
+++ b/mailimport
@@ -108,16 +108,18 @@ apply_patch () {
 
 		echo hg -m "`cat $TMP2|grep -v "^#"`" qnew $name
 		hg qnew -m "`cat $TMP2|grep -v "^#"`" $name
+		make cardlist
 		make whitespace
 		hg qrefresh
 	else
 		patch -s -t -p1 -l -N -d $pdir -i $next
-		make whitespace
-
 		if [ "$?" != "0" ]; then
 			echo "*** ERROR at: patch -s -t -p1 -l -N -d $pdir -i $next"
 			exit
 		fi
+		make cardlist
+		make whitespace
+
 		cur=`pwd`
 		cd $pdir
 		hg addremove `diffstat -p1 -l $next`
@@ -126,7 +128,8 @@ apply_patch () {
 			exit
 		fi
 		# Commit the changed files
-		hg commit  -u "$committer" -m "`cat $TMP2|grep -v "^#"`" `diffstat -p1 -l $next`
+		hg commit  -u "$committer" -m "`cat $TMP2|grep -v "^#"`" `diffstat -p1 -l $next` $cur/linux/Documentation/video4linux/CARDLIST.*
+
 		if [ "$?" != "0" ]; then
 			echo "*** ERROR at hg commit"
 			cd $cur
@@ -137,7 +140,14 @@ apply_patch () {
 	hg log -r -1 -v
 }
 
-echo git-mailsplit $MBOX $DIR
+grep -v $MBOX >$DIR/tmpbox <<EOF
+^Content-Type:
+^--Boundary-
+^Content-Disposition: inline
+^Content-Transfer-Encoding: 8bit
+EOF
+
+echo git-mailsplit $MBOX/tmpbox $DIR
 echo -n "Number of patches at file: "
 git-mailsplit $MBOX $DIR
 echo