From 978dc23547b0777febd744bc8668ce66666a81a7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 21 May 2012 12:06:54 +0000
Subject: [PATCH] Update to 3.4

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

svn path=/dists/trunk/linux-2.6/; revision=19021
---
 debian/bin/gencontrol.py | 5 +----
 debian/changelog         | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 5e01ace1c..64244bede 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -379,10 +379,7 @@ class Gencontrol(Base):
             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,
diff --git a/debian/changelog b/debian/changelog
index f1bcd6cdd..885590cd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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: