* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,

debian/modules/gencontrol.py:
  Move handling of revisions to special code.

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

debian/bin/gencontrol.py

@@ -26,6 +26,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
 
     def do_arch_setup(self, vars, makeflags, arch):
         vars.update(self.config.get(('image', arch), {}))
+        makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
         headers_arch = self.templates["control.headers.arch"]

debian/lib/python/debian_linux/gencontrol.py

@@ -41,8 +41,6 @@ class gencontrol(object):
             'SOURCEVERSION': self.version['source'],
             'UPSTREAMVERSION': self.version['upstream'],
             'ABINAME': self.abiname,
-            # TODO: Don't read this here, this is linux-2.6 specific
-            'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
         }
 
         vars = self.vars.copy()

debian/modules/gencontrol.py

@@ -6,9 +6,6 @@ from debian_linux.config import *
 from debian_linux.debian import *
 
 class gencontrol(debian_linux.gencontrol.gencontrol):
-    # TODO: workaround
-    changelog = []
-
     def __init__(self, config):
         super(gencontrol, self).__init__(config)
         self.process_config_version(config_parser({}, [sys.path[0] + "/../version"]))