[kernel] r19093 - people/benh

[Ben Hutchings]

Author: benh
Date: Thu Jun  7 05:45:57 2012
New Revision: 19093

Log:
Add support for quilt series files

Modified:
   people/benh/debian-kernel-patches-to-git

Modified: people/benh/debian-kernel-patches-to-git
==============================================================================
--- people/benh/debian-kernel-patches-to-git	Thu Jun  7 05:19:27 2012	(r19092)
+++ people/benh/debian-kernel-patches-to-git	Thu Jun  7 05:45:57 2012	(r19093)
@@ -74,7 +74,7 @@
 
 apply_series() {
     local op patch
-    if [ -f "$debdir/debian/patches/series/$series" ]; then
+    if [ -f "$debdir/debian/patches/$series" ]; then
 	while read op patch; do
 	    case "$op" in
 		+)
@@ -89,11 +89,16 @@
 		\#* | '')
 		    ;;
 		*)
-		    echo >&2 "unsupported operation in series $series: $op"
-		    exit 1
+		    if [ -z "$patch" -a -f "$debdir/debian/patches/$op" ]; then
+			# Not an op; this is actually a quilt series
+			apply_patch "$debdir/debian/patches/$op"
+		    else
+			echo >&2 "unsupported operation in series $series: $op"
+			exit 1
+		    fi
 		    ;;
 	    esac
-	done < "$debdir/debian/patches/series/$series"
+	done < "$debdir/debian/patches/$series"
     fi
 }
 
@@ -101,7 +106,7 @@
     local tag="$1" prev_tag="$2"
     shift 2
     if [ -z "$(git tag -l "$tag")" ]; then
-	echo "Applying series $* on top of $prev_tag${tag:+ to get $tag}..."
+	echo "Applying $* on top of $prev_tag${tag:+ to get $tag}..."
 	git checkout -f "$prev_tag"
 	for series in "$@"; do
 	    apply_series "$series"
@@ -159,7 +164,7 @@
 	prev_tag="v${upstream_ver/.0/}"
 	prev_tag="${prev_tag//\~/-}"
 	tag="debian/${orig_ver//\~/-}"
-	ensure_version "$tag" "$prev_tag" "orig-$dfsg_rev"
+	ensure_version "$tag" "$prev_tag" "series/orig-$dfsg_rev" series-orig
 	prev_tag="$tag"
 	prev_dfsg_rev="$dfsg_rev"
 
@@ -181,7 +186,7 @@
     else
 	tag="debian/${version//\~/-}"
     fi
-    ensure_version "$tag" "$prev_tag" ${apply_base:+base} "$debian_rev"
+    ensure_version "$tag" "$prev_tag" ${apply_base:+series/base} "series/$debian_rev" series-all
     prev_tag="$tag"
     apply_base=