[kernel] r17576 - in dists/trunk/linux-latest-2.6/debian: bin templates
Ben Hutchings
benh at alioth.debian.org
Thu Jun 2 03:14:50 UTC 2011
Author: benh
Date: Thu Jun 2 03:14:47 2011
New Revision: 17576
Log:
Prepare for Linux 3.0
Add linux-doc, linux-headers-<flavour>, linux-source, linux-tools
and xen-linux-system-<flavour> packages.
Change *-2.6-* to transitional packages, except in the
currently-unused template for separate image and modules packages
where they can be removed immediately.
Remove all 'provides' headers referring to 2.6.
Introduce a 'flavour' template variable which is the same as the
'localversion' template variable but without the leading hyphen.
Remove all use of the 'major' template variable, but where
descriptions use '@major@@localversion@', replace this with '@flavour@
configuration'.
Modified:
dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py
dists/trunk/linux-latest-2.6/debian/templates/control.doc.latest.in
dists/trunk/linux-latest-2.6/debian/templates/control.extra.in
dists/trunk/linux-latest-2.6/debian/templates/control.headers.latest.in
dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
dists/trunk/linux-latest-2.6/debian/templates/control.source.in
dists/trunk/linux-latest-2.6/debian/templates/control.source.latest.in
dists/trunk/linux-latest-2.6/debian/templates/control.tools.latest.in
dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
Modified: dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py Thu Jun 2 03:14:47 2011 (r17576)
@@ -21,7 +21,6 @@
'upstreamversion': self.version.linux_upstream,
'version': self.version.linux_version,
'source_upstream': self.version.upstream,
- 'major': self.version.linux_major,
'abiname': self.abiname,
}
@@ -57,6 +56,7 @@
config_description = self.config.merge('description', arch, featureset, flavour)
config_image = self.config.merge('image', arch, featureset, flavour)
+ vars['flavour'] = vars['localversion'][1:]
vars['class'] = config_description['hardware']
vars['longclass'] = config_description.get('hardware-long') or vars['class']
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.doc.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.doc.latest.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.doc.latest.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,8 +1,12 @@
-Package: linux-doc- at major@
+Package: linux-doc
Architecture: all
Depends: linux-doc- at upstreamversion@, ${misc:Depends}
-Provides: linux-doc
-Description: Linux kernel specific documentation for version @major@ (meta-package)
+Description: Linux kernel specific documentation (meta-package)
This package depends on the package containing the documentation for the
- latest Linux kernel @major at .
+ latest Linux kernel.
+Package: linux-doc-2.6
+Architecture: all
+Depends: linux-doc, ${misc:Depends}
+Description: Linux kernel specific documentation (dummy package)
+ This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.extra.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.extra.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -7,7 +7,7 @@
Package: linux-image-2.6-686
Architecture: i386
Depends: linux-image-686-pae, ${misc:Depends}
-Description: Linux 2.6 for modern PCs (dummy package)
+Description: Linux for modern PCs (dummy package)
This is a dummy transitional package. It can be safely removed.
Package: linux-image-686-bigmem
@@ -19,5 +19,5 @@
Package: linux-image-2.6-686-bigmem
Architecture: i386
Depends: linux-image-686-pae, ${misc:Depends}
-Description: Linux 2.6 for PCs with 4GB+ RAM (dummy package)
+Description: Linux for PCs with 4GB+ RAM (dummy package)
This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.headers.latest.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.headers.latest.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,7 +1,11 @@
-Package: linux-headers- at major@@localversion@
+Package: linux-headers at localversion@
Depends: linux-headers- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: linux-headers, linux-headers- at major@
-Description: Header files for Linux @major@@localversion@ (meta-package)
+Provides: linux-headers
+Description: Header files for Linux @flavour@ configuration (meta-package)
This package depends on the architecture-specific header files for the latest
- Linux kernel @major@@localversion at .
+ Linux kernel @flavour@ configuration.
+Package: linux-headers-2.6 at localversion@
+Depends: linux-headers at localversion@, ${misc:Depends}
+Description: Header files for Linux @flavour@ configuration (dummy package)
+ This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,24 +1,11 @@
Package: linux-image at localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, linux-modules- at major@@localversion@, ${misc:Depends}
+Depends: linux-image- at upstreamversion@@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-image- at major@@localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, linux-modules- at major@@localversion@
-Description: Linux @major@ for @class@ (meta-package)
- This package depends on the latest Linux kernel @major@ 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@
Description: Linux modules for @class@ (meta-package)
This package depends on the modules for the latest Linux kernel for use on
@longclass at .
-
-Package: linux-modules- at major@@localversion@
-Depends: linux-modules- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
-Description: Linux @major@ modules for @class@ (meta-package)
- This package depends on the modules for the latest Linux kernel @major@
- for use on @longclass at .
-
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -5,9 +5,7 @@
This package depends on the latest Linux kernel and modules for use on
@longclass at .
-Package: linux-image- at major@@localversion@
-Depends: linux-image- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: linux-latest-modules- at upstreamversion@@abiname@@localversion@
-Description: Linux @major@ for @class@ (meta-package)
- This package depends on the latest Linux kernel @major@ and modules
- for use on @longclass at .
+Package: linux-image-2.6 at localversion@
+Depends: linux-image at localversion@, ${misc:Depends}
+Description: Linux for @class@ (dummy package)
+ This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.source.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.source.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,4 +1,4 @@
-Source: linux-latest- at major@
+Source: linux-latest-2.6
Section: kernel
Priority: optional
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.source.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.source.latest.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.source.latest.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,8 +1,12 @@
-Package: linux-source- at major@
+Package: linux-source
Architecture: all
Depends: linux-source- at upstreamversion@, ${misc:Depends}
-Provides: linux-source
-Description: Linux kernel source for Linux @major@ (meta-package)
+Description: Linux kernel source (meta-package)
This package depends on packages containing the sources of the latest Linux
- kernel @major at .
+ kernel.
+Package: linux-source-2.6
+Architecture: all
+Depends: linux-source, ${misc:Depends}
+Description: Linux kernel source (dummy package)
+ This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.tools.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.tools.latest.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.tools.latest.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,7 +1,12 @@
-Package: linux-tools- at major@
+Package: linux-tools
Architecture: all
Depends: linux-tools- at upstreamversion@, ${misc:Depends}
-Provides: linux-tools
-Description: Performance analysis tools for Linux @major@ (meta-package)
+Description: Performance analysis tools for Linux (meta-package)
This package depends on the package containing the 'perf' performance
- analysis tools for the latest Linux kernel @major at .
+ analysis tools for the latest Linux kernel.
+
+Package: linux-tools-2.6
+Architecture: all
+Depends: linux-tools, ${misc:Depends}
+Description: Performance analysis tools for Linux (dummy package)
+ This is a dummy transitional package. It can be safely removed.
Modified: dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in Thu Jun 2 02:20:43 2011 (r17575)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in Thu Jun 2 03:14:47 2011 (r17576)
@@ -1,6 +1,11 @@
-Package: xen-linux-system- at major@@localversion@
+Package: xen-linux-system at localversion@
Depends: xen-linux-system- at upstreamversion@@abiname@@localversion@, ${misc:Depends}
-Provides: xen-linux-system, xen-linux-system- at major@
-Description: Xen system with Linux @major@ for @class@ (meta-package)
+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
- @major@@localversion at .
+ @flavour@ configuration.
+
+Package: xen-linux-system-2.6 at localversion@
+Depends: xen-linux-system at localversion@, ${misc:Depends}
+Description: Xen system with Linux for @class@ (dummy package)
+ This is a dummy transitional package. It can be safely removed.
More information about the Kernel-svn-changes
mailing list