* Allow versions of the form 2.6.13+2.6.14-rc4-1 to work,

at the expense of -rc4 being part of upstream rather
    than a modifier that can set the ABI. It was a bit envasive,
    hopefully it doesn't break anything.

svn path=/dists/trunk/linux-2.6/; revision=4539

debian/bin/apply

@@ -156,7 +156,7 @@ fi
 
 # for THIS particular version of the source package
 version=${override_version:-@version@}
-upstream=${version%-*}
+upstream=${override_upstream:-@upstream@}
 revision=${version#*-}
 
 home=${home:-/usr/src/kernel-patches/all/$upstream/debian}

debian/bin/gencontrol.py

@@ -48,6 +48,7 @@ def read_changelog():
             e['Distribution'] = match.group('header_distribution')
             e['Source'] = match.group('header_source')
             e['Version'] = parse_version(match.group('header_version'))
+            e['Version']['upstream'] = e['Version']['version']
             entries.append(e)
     return entries
 
@@ -88,19 +89,14 @@ def parse_version(version):
 ^
 (?P<source>
     (?:
-        \d+\.\d+\.\d+\+
+        (?P<parent>\d+\.\d+\.\d+)
+        \+
     )?
-    (?P<upstream>
-        (?P<version>
-            (?P<major>\d+\.\d+)
-            \.
-            \d+
-        )
+    (?P<version>
+        (?P<major>\d+\.\d+)
+        \.\d+
         (?:
-            -
-            (?P<modifier>
-                .+?
-            )
+            -.+?
         )?
     )
     -
@@ -115,13 +111,16 @@ def process_changelog(in_vars, config, changelog):
     ret = [None, None, None, None]
     ret[0] = version = changelog[0]['Version']
     vars = in_vars.copy()
-    if version['modifier'] is not None:
-        ret[1] = vars['abiname'] = version['modifier']
-        ret[2] = ""
-    else:
-        ret[1] = vars['abiname'] = config['base']['abiname']
-        ret[2] = "-%s" % vars['abiname']
+    ret[1] = vars['abiname'] = config['base']['abiname']
+    ret[2] = "-%s" % vars['abiname']
     vars['version'] = version['version']
+    vars['upstream'] = version['version']
+    if version['parent'] is not None:
+        version['parent'] = version['parent']
+        version['parent_and_upstream'] = version['parent'] + '+' + version['upstream']
+    else:
+        version['parent'] = ''
+        version['parent_and_upstream'] = version['upstream']
     vars['major'] = version['major']
     ret[3] = vars
     return ret
@@ -350,6 +349,7 @@ def process_real_main(packages, makefile, config, version, abiname, kpkg_abiname
         'VERSION': version['version'],
         'SOURCE_VERSION': version['source'],
         'UPSTREAM_VERSION': version['upstream'],
+        'PARENT_AND_UPSTREAM_VERSION': version['parent_and_upstream'],
         'ABINAME': abiname,
         'KPKG_ABINAME': kpkg_abiname,
     }

debian/changelog

@@ -13,7 +13,13 @@ linux-2.6 (2.6.13+2.6.14-rc4-1) UNRELEASED; urgency=low
   * Correct linux-patch-debian description.  It replaces the
     kernel-patch-debian packages, not the kernel-source packages.
 
- -- dann frazier <dannf@debian.org>  Tue, 18 Oct 2005 13:29:06 -0600
+  [ Simon Horman ]
+  * Allow versions of the form 2.6.13+2.6.14-rc4-1 to work,
+    at the expense of -rc4 being part of upstream rather
+    than a modifier that can set the ABI. It was a bit envasive,
+    hopefully it doesn't break anything. 
+
+ -- Simon Horman <horms@debian.org>  Wed, 19 Oct 2005 18:06:19 +0900
 
 linux-2.6 (2.6.13-2) UNRELEASED; urgency=low
 

debian/rules.real

@@ -135,7 +135,7 @@ $(STAMPS_DIR)/source: debian/bin/apply
 	rm -rf $(DIR)
 	mkdir -p $(DIR)
 	cp -al $(srcfiles) $(DIR)
-	cd $(DIR); override_version=$(SOURCE_VERSION) home=$(CURDIR)/debian/patches-debian sh $(CURDIR)/debian/bin/apply
+	cd $(DIR); override_version=$(SOURCE_VERSION) override_upstream=$(PARENT_AND_UPSTREAM_VERSION) home=$(CURDIR)/debian/patches-debian sh $(CURDIR)/debian/bin/apply
 	#make-kpkg does this when building kernel-source.
 	mv $(DIR)/scripts/package/Makefile $(DIR)/scripts/package/Makefile.dist
 	mv $(DIR)/scripts/package/builddeb $(DIR)/scripts/package/builddeb.dist
@@ -267,8 +267,10 @@ install-patch:
 	dh_installdirs $(DH_OPTIONS) $(pbase)/apply $(pbase)/debian $(pbase)/unpatch
 	dh_install $(DH_OPTIONS) debian/patches-debian/* $(pbase)/debian
 #	Install the debian patches
-	sed 's/@version@/$(release)/g' debian/bin/apply > $(pfull)/apply/debian
-	sed 's/@upstream@/$(version)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+	sed 's/@version@/$(SOURCE_VERSION)/g' debian/bin/apply > $(pfull)/apply/debian
+	sed 's/@upstream@/$(PARENT_AND_UPSTREAM_VERSION)/g' debian/bin/apply > $(pfull)/apply/debian
+	sed 's/@version@/$(UPSTREAM_VERSION)/g' debian/bin/unpatch > $(pfull)/unpatch/debian
+	sed 's/@upstream@/$(PARENT_AND_UPSTREAM_VERSION)/g' debian/bin/unpatch > $(pfull)/apply/debian
 	chmod 755 $(pfull)/apply/debian $(pfull)/unpatch/debian
 	chmod 644 $(pfull)/debian/*.patch
 	bzip2 -9 $(pfull)/debian/*.patch