[kernel-team] 17/47: Fix application of orig-N series for N > 0, although this is likely dead code

[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 3d49f97b033f930886716b724883907995d97060
Author: Ben Hutchings <benh at debian.org>
Date:   Thu Jun 7 05:19:27 2012 +0000

    Fix application of orig-N series for N > 0, although this is likely dead code
    
    svn path=/people/benh/; revision=19092
---
 scripts/benh/debian-kernel-patches-to-git | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/benh/debian-kernel-patches-to-git b/scripts/benh/debian-kernel-patches-to-git
index 0b0f432..f8e6cd6 100755
--- a/scripts/benh/debian-kernel-patches-to-git
+++ b/scripts/benh/debian-kernel-patches-to-git
@@ -156,13 +156,7 @@ for version in $version_list; do
 
     # Create the DFSG-compliant 'orig' version if necessary
     if [ "$dfsg_rev" != "$prev_dfsg_rev" ]; then
-	if [ -z "$prev_dfsg_rev" ]; then
-	    prev_tag="v${upstream_ver/.0/}"
-	elif [ "$prev_dfsg_rev" = 0 ]; then
-	    prev_tag="debian/$upstream_ver"
-	else
-	    prev_tag="debian/$upstream_ver.dfsg.$prev_dfsg_rev"
-	fi
+	prev_tag="v${upstream_ver/.0/}"
 	prev_tag="${prev_tag//\~/-}"
 	tag="debian/${orig_ver//\~/-}"
 	ensure_version "$tag" "$prev_tag" "orig-$dfsg_rev"

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