[kernel] r17560 - in dists/trunk/linux-kbuild-2.6/debian: bin lib/python/debian_linux templates

[Ben Hutchings]

Author: benh
Date: Wed Jun  1 07:19:05 2011
New Revision: 17560

Log:
Prepare gencontrol and templates for Linux 3.0

- Fix source package name as linux-kbuild-2.6
- Remove the 'major' template variable and 'MAJOR' make variable

Modified:
   dists/trunk/linux-kbuild-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/debian.py
   dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux-kbuild-2.6/debian/templates/control.source.in

Modified: dists/trunk/linux-kbuild-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/bin/gencontrol.py	Wed Jun  1 07:08:15 2011	(r17559)
+++ dists/trunk/linux-kbuild-2.6/debian/bin/gencontrol.py	Wed Jun  1 07:19:05 2011	(r17560)
@@ -38,7 +38,6 @@
 
     def do_main_setup(self, vars, makeflags):
         makeflags.update({
-            'MAJOR': self.version.linux_major,
             'VERSION': self.version.linux_version,
             'UPSTREAMVERSION': self.version.linux_upstream,
         })
@@ -58,7 +57,6 @@
             'upstreamversion': version.linux_upstream,
             'version': version.linux_version,
             'source_upstream': version.upstream,
-            'major': version.linux_major,
         }
 
     def process_relation(self, key, e, in_e, vars):

Modified: dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/debian.py	Wed Jun  1 07:08:15 2011	(r17559)
+++ dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/debian.py	Wed Jun  1 07:19:05 2011	(r17560)
@@ -94,9 +94,7 @@
     _version_linux_rules = ur"""
 ^
 (?P<version>
-    (?P<major>\d+\.\d+)
-    \.
-    \d+
+    \d+\.\d+\.\d+
 )
 (?:
     (\.\d+)
@@ -124,7 +122,6 @@
         if match is None:
             raise RuntimeError, "Invalid debian linux version"
         d = match.groupdict()
-        self.linux_major = d['major']
         self.linux_modifier = d['modifier']
         self.linux_version = d['version']
         if d['modifier'] is not None:

Modified: dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/gencontrol.py	Wed Jun  1 07:08:15 2011	(r17559)
+++ dists/trunk/linux-kbuild-2.6/debian/lib/python/debian_linux/gencontrol.py	Wed Jun  1 07:19:05 2011	(r17560)
@@ -105,7 +105,6 @@
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags.update({
-            'MAJOR': self.version.linux_major,
             'VERSION': self.version.linux_version,
             'UPSTREAMVERSION': self.version.linux_upstream,
             'ABINAME': self.abiname,
@@ -282,7 +281,6 @@
             'upstreamversion': version.linux_upstream,
             'version': version.linux_version,
             'source_upstream': version.upstream,
-            'major': version.linux_major,
             'abiname': abiname,
         }
 

Modified: dists/trunk/linux-kbuild-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/templates/control.source.in	Wed Jun  1 07:08:15 2011	(r17559)
+++ dists/trunk/linux-kbuild-2.6/debian/templates/control.source.in	Wed Jun  1 07:19:05 2011	(r17560)
@@ -1,4 +1,4 @@
-Source: linux-kbuild- at major@
+Source: linux-kbuild-2.6
 Section: devel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>