[kernel] r7200 - in dists/sid/linux-2.6/debian: bin

[Bastian Blank]

Author: waldi
Date: Sun Aug 20 11:08:37 2006
New Revision: 7200

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py
   dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux/debian.py
debian/lib/python/debian_linux/gencontrol.py: Make it possible to parse
changelogs which does not follow the linux package versioning.


Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 20 11:08:37 2006
@@ -176,10 +176,10 @@
         unpatch = self.templates['patch.unpatch']
 
         vars = {
-            'home': '/usr/src/kernel-patches/all/%s' % self.version['source_upstream'],
+            'home': '/usr/src/kernel-patches/all/%s' % self.version['linux']['source_upstream'],
             'revisions': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
         }
-        vars.update(self.version)
+        vars.update(self.version['linux'])
 
         apply = self.substitute(apply, vars)
         unpatch = self.substitute(unpatch, vars)
@@ -190,7 +190,7 @@
     def process_changelog(self):
         version = self.changelog[0]['Version']
         self.process_version(version)
-        if version['modifier'] is not None:
+        if version['linux']['modifier'] is not None:
             self.abiname = self.vars['abiname'] = ''
         else:
             self.abiname = self.vars['abiname'] = '-%s' % self.config['abi',]['abiname']
@@ -212,17 +212,17 @@
 
     def process_real_tree(self, in_entry, vars):
         entry = self.process_package(in_entry, vars)
-        tmp = self.changelog[0]['Version']['upstream']
+        tmp = self.changelog[0]['Version']['linux']['upstream']
         versions = []
         for i in self.changelog:
-            if i['Version']['upstream'] != tmp:
+            if i['Version']['linux']['upstream'] != tmp:
                 break
-            versions.insert(0, i['Version'])
+            versions.insert(0, i['Version']['linux'])
         for i in (('Depends', 'Provides')):
             value = package_relation_list()
             value.extend(entry.get(i, []))
             if i == 'Depends':
-                value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version'])
+                value.append("linux-patch-debian-%(version)s (= %(source)s)" % self.changelog[0]['Version']['linux'])
                 value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % v for v in versions]))
             elif i == 'Provides':
                 value.extend(["linux-tree-%(source)s" % v for v in versions])

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/debian.py	Sun Aug 20 11:08:37 2006
@@ -47,6 +47,25 @@
     return entries
 
 def parse_version(version):
+    ret = {
+        'complete': version,
+        'upstream': version,
+        'debian': None,
+        'linux': None,
+    }
+    try:
+        i = len(version) - version[::-1].index('-')
+    except ValueError:
+        return
+    ret['upstream'] = version[:i-1]
+    ret['debian'] = version[i:]
+    try:
+        ret['linux'] = parse_version_linux(version)
+    except ValueError:
+        pass
+    return ret
+
+def parse_version_linux(version):
     version_re = ur"""
 ^
 (?P<source>

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	Sun Aug 20 11:08:37 2006
@@ -50,11 +50,11 @@
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags.update({
-            'MAJOR': self.version['major'],
-            'VERSION': self.version['version'],
-            'SOURCE_UPSTREAM': self.version['source_upstream'],
-            'SOURCEVERSION': self.version['source'],
-            'UPSTREAMVERSION': self.version['upstream'],
+            'MAJOR': self.version['linux']['major'],
+            'VERSION': self.version['linux']['version'],
+            'SOURCE_UPSTREAM': self.version['linux']['source_upstream'],
+            'SOURCEVERSION': self.version['linux']['source'],
+            'UPSTREAMVERSION': self.version['linux']['upstream'],
             'ABINAME': self.abiname,
         })
 
@@ -237,10 +237,10 @@
     def process_version(self, version):
         self.version = version
         self.vars = {
-            'upstreamversion': version['upstream'],
-            'version': version['version'],
-            'source_upstream': version['source_upstream'],
-            'major': version['major'],
+            'upstreamversion': version['linux']['upstream'],
+            'version': version['linux']['version'],
+            'source_upstream': version['linux']['source_upstream'],
+            'major': version['linux']['major'],
         }
 
     def substitute(self, s, vars):