[kernel-team] 13/47: Support the new patch series convention when exporting to git

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository kernel-team.

commit 555302f2170c1ea76afa5bf8d4f4bc041112dd55
Author: Ben Hutchings <benh at debian.org>
Date:   Sat May 19 15:39:07 2012 +0000

    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.
    
    svn path=/people/benh/; revision=19013
---
 scripts/benh/debian-kernel-patches-to-git | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/benh/debian-kernel-patches-to-git b/scripts/benh/debian-kernel-patches-to-git
index d004b01..0b0f432 100755
--- a/scripts/benh/debian-kernel-patches-to-git
+++ b/scripts/benh/debian-kernel-patches-to-git
@@ -133,8 +133,19 @@ git clean -d -f
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/kernel-team.git