[kernel] r6347 - in dists/sid/linux-2.6/debian: lib/python/debian_linux modules

[Bastian Blank]

Author: waldi
Date: Thu Mar 30 12:12:29 2006
New Revision: 6347

Modified:
   dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/sid/linux-2.6/debian/modules/gencontrol.py
Log:
* debian/lib/python/debian_linux/gencontrol.py: Export major.
* debian/modules/gencontrol.py: Don't redefine function.


Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Mar 30 12:12:29 2006
@@ -37,6 +37,7 @@
 
     def do_main(self, packages, makefile):
         makeflags = {
+            'MAJOR': self.version['major'],
             'VERSION': self.version['version'],
             'SOURCE_UPSTREAM': self.version['source_upstream'],
             'SOURCEVERSION': self.version['source'],

Modified: dists/sid/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/modules/gencontrol.py	Thu Mar 30 12:12:29 2006
@@ -11,7 +11,6 @@
         main = self.templates["control.main"]
         packages.extend(self.process_packages(main, vars))
 
-    def do_main_packages(self, packages):
         l = ['linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch) for arch in self.config['base',]['arches']]
         packages['source']['Build-Depends'].extend(l)