[kernel] r6425 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux modules

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 16:56:10 2006
New Revision: 6425

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux-2.6/debian/modules/gencontrol.py
Log:
* debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
  debian/modules/gencontrol.py:
  Move handling of revisions to special code.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Fri Apr 14 16:56:10 2006
@@ -26,6 +26,7 @@
 
     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"]

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Fri Apr 14 16:56:10 2006
@@ -41,8 +41,6 @@
             '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()

Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py	Fri Apr 14 16:56:10 2006
@@ -6,9 +6,6 @@
 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"]))