debian/bin/gencontrol.py, debian/lib/python/debian_linux/debian.py: Update.

svn path=/dists/sid/linux-2.6/; revision=8194

3 files changed, 16 insertions, 20 deletions

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 7bb002bd2872..b22bad4e5ace 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -7,7 +7,6 @@ from debian_linux.debian import *
 class gencontrol(debian_linux.gencontrol.gencontrol):
     def __init__(self):
         super(gencontrol, self).__init__()
-        self.changelog = read_changelog()
         self.process_changelog()
 
     def do_main_setup(self, vars, makeflags, extra):
@@ -218,8 +217,9 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         vars = {
             'home': '/usr/src/kernel-patches/all/%s/debian' % self.version['linux']['upstream'],
             'revisions': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
+            'source': "%(upstream)s-%(debian)s" % self.version['linux'],
+            'upstream': self.version['linux']['upstream'],
         }
-        vars.update(self.version['linux'])
 
         apply = self.substitute(apply, vars)
         unpatch = self.substitute(unpatch, vars)
@@ -228,6 +228,14 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
         file('debian/bin/patch.unpatch', 'w').write(unpatch)
 
     def process_changelog(self):
+        in_changelog = read_changelog()
+        act_upstream = in_changelog[0]['Version']['linux']['upstream']
+        changelog = []
+        for i in in_changelog:
+            if i['Version']['linux']['upstream'] != act_upstream:
+                break
+            changelog.append(i)
+        self.changelog = changelog
         self.version = self.changelog[0]['Version']
         if self.version['linux']['modifier'] is not None:
             self.abiname = ''
@@ -250,12 +258,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
 
     def process_real_tree(self, in_entry, vars):
         entry = self.process_package(in_entry, vars)
-        tmp = self.changelog[0]['Version']['linux']['upstream']
-        versions = []
-        for i in self.changelog:
-            if i['Version']['linux']['upstream'] != tmp:
-                break
-            versions.insert(0, i['Version']['linux'])
+        versions = [i['Version']['linux'] for i in self.changelog[::-1]]
         for i in (('Depends', 'Provides')):
             value = package_relation_list()
             value.extend(entry.get(i, []))
diff --git a/debian/lib/python/debian_linux/debian.py b/debian/lib/python/debian_linux/debian.py
index eb819ca6bd72..5159849da7c7 100644
--- a/debian/lib/python/debian_linux/debian.py
+++ b/debian/lib/python/debian_linux/debian.py
@@ -24,7 +24,6 @@ def read_changelog(dir = ''):
 """, re.VERBOSE)
     f = file(os.path.join(dir, "debian/changelog"))
     entries = []
-    act_upstream = None
     while True:
         line = f.readline()
         if not line:
@@ -39,10 +38,6 @@ def read_changelog(dir = ''):
             e['Source'] = match.group('header_source')
             version = parse_version(match.group('header_version'))
             e['Version'] = version
-            if act_upstream is None:
-                act_upstream = version['upstream']
-            elif version['upstream'] != act_upstream:
-                break
             entries.append(e)
     return entries
 
@@ -85,6 +80,9 @@ def parse_version_linux(version):
             )
         )?
     )
+    (?:
+        \.dfsg\.\d+
+    )?
     -
     (?P<debian>[^-]+)
 )
@@ -93,12 +91,7 @@ $
     match = re.match(version_re, version, re.X)
     if match is None:
         raise ValueError
-    ret = match.groupdict()
-    if ret['parent'] is not None:
-        ret['source_upstream'] = ret['parent'] + ret['upstream']
-    else:
-        ret['source_upstream'] = ret['upstream']
-    return ret
+    return match.groupdict()
 
 class package_description(object):
     __slots__ = "short", "long"
diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py
index 96d1ff49e520..7fd2505d83d1 100644
--- a/debian/lib/python/debian_linux/gencontrol.py
+++ b/debian/lib/python/debian_linux/gencontrol.py
@@ -241,7 +241,7 @@ class gencontrol(object):
         return {
             'upstreamversion': version['linux']['upstream'],
             'version': version['linux']['version'],
-            'source_upstream': version['linux']['source_upstream'],
+            'source_upstream': version['upstream'],
             'major': version['linux']['major'],
             'abiname': abiname,
         }