[kernel] r19013 - people/benh

[Ben Hutchings]

Author: benh
Date: Sat May 19 15:39:07 2012
New Revision: 19013

Log:
Support the new patch series convention when exporting to git

Since 3.1, we use a single series and drop rather than reverting
patches, so each version is effectively on a separate branch
from the upstream version.

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

Modified: people/benh/debian-kernel-patches-to-git
==============================================================================
--- people/benh/debian-kernel-patches-to-git	Sat May 19 15:36:28 2012	(r19012)
+++ people/benh/debian-kernel-patches-to-git	Sat May 19 15:39:07 2012	(r19013)
@@ -133,8 +133,19 @@
 prev_dfsg_rev=
 apply_base=y
 
-for version in $(dpkg-parsechangelog -l"$debdir"/debian/changelog --since "$upstream_ver-0" --format rfc822 2>/dev/null | sed 's/^Version: //; t; d' | tac); do
+if dpkg --compare-versions "$latest_version" lt 3.1; then
+    # We used to add an extra series file for each Debian revision,
+    # containing reverts if necessary, so there is a linear history
+    # through all versions based on a single upstream version.
+    version_list="$(dpkg-parsechangelog -l"$debdir"/debian/changelog --since "$upstream_ver-0" --format rfc822 2>/dev/null | sed 's/^Version: //; t; d' | tac)"
+else
+    # Since 3.1, we use a single series and drop rather than reverting
+    # patches, so each version is effectively on a separate branch
+    # from the upstream version.
+    version_list="$latest_version"
+fi
 
+for version in $version_list; do
     orig_ver="${version%-*}"
     if [ "$upstream_ver" = "$orig_ver" ]; then
 	dfsg_rev=0