[kernel] r18246 - dists/trunk/linux-2.6/debian/bin

[Ben Hutchings]

Author: benh
Date: Sat Nov 12 04:05:20 2011
New Revision: 18246

Log:
Add '.0' to ABI name whenever upstream version has 2 components

This is not just for 3.0 and 3.1.  We will remove this after wheezy
release, whichever version that is.

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

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Nov 12 03:50:35 2011	(r18245)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Nov 12 04:05:20 2011	(r18246)
@@ -344,15 +344,13 @@
         self.versions = versions
         version = self.version = self.changelog[0].version
         if self.version.linux_modifier is not None:
-            self.abiname = self.version.linux_upstream
             self.abiname_part = ''
         else:
             self.abiname_part = '-%s' % self.config['abi',]['abiname']
-            # XXX: We need to add another part before Wheezy
-            if self.version.linux_upstream in ('3.0', '3.1'):
-                self.abiname = self.version.linux_upstream + '.0' + self.abiname_part
-            else:
-                self.abiname = self.version.linux_upstream + self.abiname_part
+        # XXX: We need to add another part until after wheezy
+        self.abiname = (re.sub('^(\d+\.\d+)(?=-|$)', r'\1.0',
+                               self.version.linux_upstream)
+                        + self.abiname_part)
         self.vars = {
             'upstreamversion': self.version.linux_upstream,
             'version': self.version.linux_version,