[kernel] r7109 - dists/trunk/linux-modules-extra-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Mon Aug  7 23:19:21 2006
New Revision: 7109

Modified:
   dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py

Log:
debian/bin/gencontrol.py: Use own version, not version of support package.


Modified: dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	Mon Aug  7 23:19:21 2006
@@ -8,7 +8,7 @@
 class gencontrol(debian_linux.gencontrol.gencontrol):
     def __init__(self, configdir):
         super(gencontrol, self).__init__(configdir)
-        self.process_config_version(config.config_parser({}, [sys.argv[1] + "/version"]))
+        self.process_changelog()
         self.config = config_reader_modules(self.config)
 
     def do_main_makefile(self, makefile, makeflags, extra):
@@ -89,10 +89,14 @@
         makefile.append(("build-%s-%s-%s-%s:" % (arch, subarch, flavour, module), cmds_build))
         makefile.append(("setup-%s-%s-%s-%s:" % (arch, subarch, flavour, module), cmds_setup))
 
-    def process_config_version(self, config):
-        entry = config['version',]
-        self.process_version(parse_version(entry['source']))
-        self.vars['abiname'] = self.abiname = entry['abiname']
+    def process_changelog(self):
+        changelog = read_changelog()
+        version = changelog[0]['Version']
+        self.process_version(version)
+        if version['modifier'] is not None:
+            self.abiname = self.vars['abiname'] = ''
+        else:
+            self.abiname = self.vars['abiname'] = '-%s' % self.config['abi',]['abiname']
 
 class config_reader_modules(config.config_reader):
     schema_base = {