[kernel] r6978 - in people/waldi/linux-latest-2.6/debian: .

[Bastian Blank]

Author: waldi
Date: Mon Jul 10 18:13:59 2006
New Revision: 6978

Modified:
   people/waldi/linux-latest-2.6/debian/bin/gencontrol.py
   people/waldi/linux-latest-2.6/debian/changelog

Log:
* debian/bin/gencontrol.py: Produce version like 2.6.16+0.1 for binary packages.
* debian/changelog: Set version to 0.1.


Modified: people/waldi/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-latest-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-latest-2.6/debian/bin/gencontrol.py	Mon Jul 10 18:13:59 2006
@@ -9,6 +9,7 @@
     def __init__(self, config):
         super(gencontrol, self).__init__(config)
         self.process_config_version(config_parser({}, [sys.argv[1] + "/version"]))
+        self.process_changelog_version()
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         image_latest = self.templates["control.image.latest"]
@@ -27,6 +28,7 @@
                 package['Architecture'] = [arch]
                 packages.append(package)
 
+        makeflags['GENCONTROL_ARGS'] = '-v%s' % self.version['source']
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []
@@ -34,10 +36,58 @@
         makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
         makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour)))
 
+    def process_changelog_version(self):
+        changelog_version = read_changelog()[0]['Version']
+        # HACKALARM
+        self.version['source'] = '%s+%s' % (self.version['upstream'], changelog_version)
+
     def process_config_version(self, config):
         entry = config['version',]
         self.process_version(parse_version(entry['source']))
         self.vars['abiname'] = self.abiname = entry['abiname']
 
+# HACKALARM
+def read_changelog(dir = ''):
+    r = re.compile(r"""
+^
+(
+(?P<header>
+    (?P<header_source>
+        \w[-+0-9a-z.]+
+    )
+    \ 
+    \(
+    (?P<header_version>
+        [^\(\)\ \t]+
+    )
+    \)
+    \s+
+    (?P<header_distribution>
+        [-0-9a-zA-Z]+
+    )
+    \;
+)
+)
+""", re.VERBOSE)
+    f = file(os.path.join(dir, "debian/changelog"))
+    entries = []
+    act_upstream = None
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        line = line.strip('\n')
+        match = r.match(line)
+        if not match:
+            continue
+        if match.group('header'):
+            e = {}
+            e['Distribution'] = match.group('header_distribution')
+            e['Source'] = match.group('header_source')
+            e['Version'] = match.group('header_version')
+            entries.append(e)
+            break
+    return entries
+
 if __name__ == '__main__':
     gencontrol(sys.argv[1] + "/arch")()

Modified: people/waldi/linux-latest-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-latest-2.6/debian/changelog	(original)
+++ people/waldi/linux-latest-2.6/debian/changelog	Mon Jul 10 18:13:59 2006
@@ -1,4 +1,4 @@
-linux-latest-2.6 (2.6.16-16) UNRELEASED; urgency=low
+linux-latest-2.6 (0.1) UNRELEASED; urgency=low
 
   * Initial release.