[kernel] r17482 - in dists/trunk/linux-2.6/debian: . bin lib/python/debian_linux templates
Ben Hutchings
benh at alioth.debian.org
Mon May 30 18:54:32 UTC 2011
Author: benh
Date: Mon May 30 18:54:31 2011
New Revision: 17482
Log:
Prepare gencontrol and templates for Linux 3.0
- Remove all relations based on the 'major' template variable
- Define 'source_package' template variable and use it in place
of 'linux- at major@' in linux-patch-debian-<version> description
- Expect only 2 upstream version components if first component is
not '2'
- Remove the 'major' template variable and 'MAJOR' make variable
Modified:
dists/trunk/linux-2.6/debian/README.source
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
dists/trunk/linux-2.6/debian/templates/control.headers.in
dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
dists/trunk/linux-2.6/debian/templates/control.main.in
Modified: dists/trunk/linux-2.6/debian/README.source
==============================================================================
--- dists/trunk/linux-2.6/debian/README.source Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/README.source Mon May 30 18:54:31 2011 (r17482)
@@ -84,7 +84,6 @@
into the templates:
@version@ Upstream kernel version, for example 2.6.11.
- at major@ The major version, for example 2.6
@arch@ The Debian arch name, such as powerpc or i386.
@flavour@ The build flavour, such as 686 or k7-smp.
@class@ The CPU/architecture class; displayed in synopsis. It should
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Mon May 30 18:54:31 2011 (r17482)
@@ -22,7 +22,6 @@
def do_main_setup(self, vars, makeflags, extra):
super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
makeflags.update({
- 'MAJOR': self.version.linux_major,
'VERSION': self.version.linux_version,
'UPSTREAMVERSION': self.version.linux_upstream,
'ABINAME': self.abiname,
@@ -335,7 +334,7 @@
'upstreamversion': self.version.linux_upstream,
'version': self.version.linux_version,
'source_upstream': self.version.upstream,
- 'major': self.version.linux_major,
+ 'source_package': self.changelog[0].source,
'abiname': self.abiname,
}
self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname}
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Mon May 30 18:54:31 2011 (r17482)
@@ -100,9 +100,7 @@
_version_linux_rules = ur"""
^
(?P<version>
- (?P<major>\d+\.\d+)
- \.
- \d+
+ (?:2\.)?\d+\.\d+
)
(?:
~
@@ -138,7 +136,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-2.6/debian/templates/control.headers.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,6 +1,6 @@
Package: linux-headers- at upstreamversion@@abiname@@localversion@
Depends: linux-headers- at upstreamversion@@abiname at -common@localversion_headers@ (= ${binary:Version}), linux-kbuild- at version@, ${misc:Depends}
-Provides: linux-headers, linux-headers- at major@
+Provides: linux-headers
Description: Header files for Linux @upstreamversion@@abiname@@localversion@
This package provides the architecture-specific kernel header files
for Linux kernel @upstreamversion@@abiname@@localversion@, generally
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,5 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-modules- at upstreamversion@@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
Depends: module-init-tools, ${misc:Depends}
Suggests: linux-doc- at version@
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,5 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image- at major@
+Provides: linux-image
Depends: linux-modules- at upstreamversion@@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,5 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-modules- at upstreamversion@@abiname@@localversion@
Depends: module-init-tools, ${misc:Depends}
Suggests: linux-doc- at version@
Description: Linux @upstreamversion@ for @class@
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,5 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
+Provides: linux-image, linux-modules- at upstreamversion@@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
Recommends: firmware-linux-free (>= 3~)
Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-standalone.in Mon May 30 18:54:31 2011 (r17482)
@@ -1,5 +1,5 @@
Package: linux-image- at upstreamversion@@abiname@@localversion@
-Provides: linux-image, linux-image- at major@
+Provides: linux-image
Suggests: linux-doc- at version@
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Linux @upstreamversion@ for @class@
Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in Mon May 30 18:31:25 2011 (r17481)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in Mon May 30 18:54:31 2011 (r17482)
@@ -13,7 +13,7 @@
Package: linux-source- at version@
Architecture: all
Section: kernel
-Provides: linux-source, linux-source- at major@
+Provides: linux-source
Depends: binutils, bzip2, ${misc:Depends}
Recommends: libc6-dev | libc-dev, gcc, make
Suggests: libncurses-dev | ncurses-dev, kernel-package, libqt3-mt-dev
@@ -28,7 +28,6 @@
Architecture: all
Depends: ${misc:Depends}
Section: doc
-Provides: linux-doc- at major@
Description: Linux kernel specific documentation for version @version@
This package provides the various README files and HTML documentation for
the Linux kernel version @version at . Plenty of information, including the
@@ -41,9 +40,9 @@
Architecture: all
Depends: ${misc:Depends}
Section: doc
-Provides: linux-manual, kernel-manual- at major@
-Conflicts: linux-manual, kernel-manual- at major@
-Replaces: linux-manual, kernel-manual- at major@
+Provides: linux-manual
+Conflicts: linux-manual
+Replaces: linux-manual
Description: Linux kernel API manual pages for version @version@
This package provides the Kernel Hacker's Guide in the form of
manual pages, describing the kernel API functions. They
@@ -65,7 +64,7 @@
.
Note that these patches do NOT apply against a pristine
Linux @version@ kernel but only against the kernel tarball
- linux- at major@_ at source_upstream@.orig.tar.gz from the Debian archive.
+ @source_package at _@source_upstream at .orig.tar.gz from the Debian archive.
Package: linux-support- at upstreamversion@@abiname@
Architecture: all
More information about the Kernel-svn-changes
mailing list