[kernel] r18283 - in dists/sid/linux-latest-2.6/debian: . bin templates

[Ben Hutchings]

Author: benh
Date: Mon Nov 14 07:10:34 2011
New Revision: 18283

Log:
Update to 3.1.0-1

Update use of version numbers/strings accordingly:
- 'abiname' now includes the upstream version part
- The upstream stable release (2 components) is now 'linux_version'

Modified:
   dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/rules.defs
   dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
   dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in
   dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
   dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
   dists/sid/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Mon Nov 14 07:10:34 2011	(r18283)
@@ -25,14 +25,14 @@
         }
 
         changelog_version = Changelog()[0].version
-        self.package_version = '%s+%s' % (self.version.upstream, changelog_version.complete)
+        self.package_version = '%s+%s' % (self.version.linux_version, changelog_version.complete)
 
     def do_main_setup(self, vars, makeflags, extra):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
 
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages['source']['Build-Depends'].extend(
-            ['linux-support-%s%s' % (self.version.linux_upstream, self.abiname)]
+            ['linux-support-%s' % self.abiname]
         )
 
         latest_source = self.templates["control.source.latest"]

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/changelog	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,6 +1,7 @@
 linux-latest-2.6 (41) UNRELEASED; urgency=low
 
   * Remove dependency on module makefiles in linux-support package
+  * Update to 3.1.0-1
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 14 Nov 2011 06:28:47 +0000
 

Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/rules.defs	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,4 +1,4 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 TEMPLATES_DIR = debian/templates
-KERNELVERSION := 3.0.0-2
+KERNELVERSION := 3.1.0-1

Modified: dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in	Mon Nov 14 07:10:34 2011	(r18283)
@@ -2,4 +2,4 @@
 This is probably not what you intended to do.
 
 If you want to report a bug in the Linux kernel or modules, you should use
-the package name linux-image- at upstreamversion@@abiname@@localversion@ instead.
+the package name linux-image- at abiname@@localversion@ instead.

Modified: dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,5 +1,5 @@
 Package: linux-headers at localversion@
-Depends: linux-headers- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
+Depends: linux-headers- at abiname@@localversion@, ${misc:Depends}
 Provides: linux-headers
 Description: Header files for Linux @flavour@ configuration (meta-package)
  This package depends on the architecture-specific header files for the latest

Modified: dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,11 +1,11 @@
 Package: linux-image at localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, linux-modules at localversion@, ${misc:Depends}
+Depends: linux-image- at abiname@@localversion@, linux-modules at localversion@, ${misc:Depends}
 Description: Linux for @class@ (meta-package)
  This package depends on the latest Linux kernel for use on @longclass at .
 
 Package: linux-modules at localversion@
-Depends: linux-modules- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
+Depends: linux-modules- at abiname@@localversion@, ${misc:Depends}
+Provides: linux-latest-modules- at abiname@@localversion@
 Description: Linux modules for @class@ (meta-package)
  This package depends on the modules for the latest Linux kernel for use on
  @longclass at .

Modified: dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,6 +1,6 @@
 Package: linux-image at localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
+Depends: linux-image- at abiname@@localversion@, ${misc:Depends}
+Provides: linux-latest-modules- at abiname@@localversion@
 Description: Linux for @class@ (meta-package)
  This package depends on the latest Linux kernel and modules for use on
  @longclass at .

Modified: dists/sid/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in	Mon Nov 14 06:55:42 2011	(r18282)
+++ dists/sid/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in	Mon Nov 14 07:10:34 2011	(r18283)
@@ -1,5 +1,5 @@
 Package: xen-linux-system at localversion@
-Depends: xen-linux-system- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
+Depends: xen-linux-system- at abiname@@localversion@, ${misc:Depends}
 Provides: xen-linux-system
 Description: Xen system with Linux for @class@ (meta-package)
  This package depends on the Xen hypervisor and the latest Linux kernel