[kernel] r19021 - in dists/trunk/linux-2.6/debian: . bin

[Ben Hutchings]

Author: benh
Date: Mon May 21 12:06:54 2012
New Revision: 19021

Log:
Update to 3.4

Drop the '.0'; everything in wheezy and beyond should cope with
2-component versions.

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

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Mon May 21 03:06:52 2012	(r19020)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Mon May 21 12:06:54 2012	(r19021)
@@ -379,10 +379,7 @@
             self.abiname_part = ''
         else:
             self.abiname_part = '-%s' % self.config['abi', ]['abiname']
-        # 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.abiname = self.version.linux_upstream + self.abiname_part
         self.vars = {
             'upstreamversion': self.version.linux_upstream,
             'version': self.version.linux_version,

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 21 03:06:52 2012	(r19020)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 21 12:06:54 2012	(r19021)
@@ -1,3 +1,9 @@
+linux-2.6 (3.4-1~experimental.1) UNRELEASED; urgency=low
+
+  * New upstream release: http://kernelnewbies.org/Linux_3.4
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
+
 linux-2.6 (3.3.6-1~experimental.1) experimental; urgency=low
 
   * New upstream stable update: