[kernel] r5213 - in people/waldi/linux-2.6/debian:
lib/python/debian_linux templates
Bastian Blank
waldi at costa.debian.org
Tue Jan 3 19:45:42 UTC 2006
Author: waldi
Date: Tue Jan 3 19:45:41 2006
New Revision: 5213
Modified:
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
people/waldi/linux-2.6/debian/templates/control.headers.in
people/waldi/linux-2.6/debian/templates/control.headers.latest.in
people/waldi/linux-2.6/debian/templates/control.headers.subarch.in
people/waldi/linux-2.6/debian/templates/control.image.in
people/waldi/linux-2.6/debian/templates/control.image.latest.in
people/waldi/linux-2.6/debian/templates/control.source.in
Log:
* debian/templates: Move subarch part in package names in front of flavour.
* debian/lib/python/debian_linux/gencontrol.py: Fix subarch text setting.
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Tue Jan 3 19:45:41 2006
@@ -122,7 +122,7 @@
if subarch == 'none':
vars['subarch'] = ''
else:
- vars['subarch'] = '%s-' % subarch
+ vars['subarch'] = '-%s' % subarch
config_entry = self.config['base', arch, subarch]
vars.update(config_entry)
Modified: people/waldi/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.in Tue Jan 3 19:45:41 2006
@@ -1,15 +1,15 @@
-Package: linux-headers- at subarch@@version at -@abiname at -@flavour@
+Package: linux-headers- at version@- at abiname@@subarch at -@flavour@
Section: devel
Priority: optional
-Depends: linux-headers- at subarch@@version at -@abiname@ (= ${Source-Version})
+Depends: linux-headers- at version@- at abiname@@subarch@ (= ${Source-Version})
Provides: linux-headers, linux-headers- at major@
Description: Header files for Linux kernel @version@ on @class@ machines
This package provides the architecture-specific kernel header files
for Linux kernel @version@ on @longclass@ machines, generally
used for building out-of-tree kernel modules. These files are going to be
- installed into /usr/src/linux-headers- at subarch@@version at -@abiname at -@flavour@, and can
+ installed into /usr/src/linux-headers- at version@- at abiname@@subarch at -@flavour@, and can
be used for building modules that load into the kernel provided by the
- linux-image- at subarch@@version at -@abiname at -@flavour@ package.
+ linux-image- at version@- at abiname@@subarch at -@flavour@ package.
.
This packages is produced using an updated kernel packaging system
and replaces older kernel-headers packages
Modified: people/waldi/linux-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.latest.in Tue Jan 3 19:45:41 2006
@@ -1,7 +1,7 @@
-Package: linux-headers- at subarch@@major at -@flavour@
+Package: linux-headers- at major@@subarch at -@flavour@
Section: devel
Priority: optional
-Depends: linux-headers- at subarch@@version at -@abiname at -@flavour@
+Depends: linux-headers- at version@- at abiname@@subarch at -@flavour@
Provides: linux-headers, linux-headers- at major@
Description: Architecture-specific header files for Linux kernel @major@ on @class@ machines
This package depends on the architecture-specific header files for the latest
Modified: people/waldi/linux-2.6/debian/templates/control.headers.subarch.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.headers.subarch.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.headers.subarch.in Tue Jan 3 19:45:41 2006
@@ -1,4 +1,4 @@
-Package: linux-headers- at subarch@@version at -@abiname@
+Package: linux-headers- at version@- at abiname@@subarch@
Section: devel
Priority: optional
Provides: linux-headers, linux-headers- at major@
@@ -6,10 +6,10 @@
This package provides the (sub)architecture-specific common kernel header files
for Linux kernel version @version@, generally used for building out-of-tree
kernel modules. To obtain a complete set of headers you also need to install
- the linux-headers- at subarch@@version at -@abiname at -(flavour) package, matching the
+ the linux-headers- at version@- at abiname@@subarch at -(flavour) package, matching the
flavour of the kernel you intend the build for. To obtain such a set for the
currently running kernel it is sufficient to run a command
.
- apt-get install linux-headers- at subarch@$(uname -r)
+ apt-get install linux-headers-$(uname -r)
.
- and it will be unpacked in /usr/src/linux-headers- at subarch@@version at -@abiname at -(flavour).
+ and it will be unpacked in /usr/src/linux-headers- at version@- at abiname@@subarch at -(flavour).
Modified: people/waldi/linux-2.6/debian/templates/control.image.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.in Tue Jan 3 19:45:41 2006
@@ -1,4 +1,4 @@
-Package: linux-image- at subarch@@version at -@abiname at -@flavour@
+Package: linux-image- at version@- at abiname@@subarch at -@flavour@
Section: base
Priority: optional
Provides: linux-image, linux-image- at major@
Modified: people/waldi/linux-2.6/debian/templates/control.image.latest.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.image.latest.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.image.latest.in Tue Jan 3 19:45:41 2006
@@ -1,15 +1,15 @@
-Package: linux-image- at subarch@@flavour@
+Package: linux-image at subarch@- at flavour@
Section: base
Priority: optional
-Depends: linux-image- at subarch@@major at -@flavour@
+Depends: linux-image- at major@@subarch at -@flavour@
Description: Linux kernel image on @class@ machines
This package depends on the latest binary image for Linux kernel on
@longclass@ machines.
-Package: linux-image- at subarch@@major at -@flavour@
+Package: linux-image- at major@@subarch at -@flavour@
Section: base
Priority: optional
-Depends: linux-image- at subarch@@version at -@abiname at -@flavour@
+Depends: linux-image- at version@- at abiname@@subarch at -@flavour@
Description: Linux kernel @major@ image on @class@ machines
This package depends on the latest binary image for Linux kernel @major@
on @longclass@ machines.
Modified: people/waldi/linux-2.6/debian/templates/control.source.in
==============================================================================
--- people/waldi/linux-2.6/debian/templates/control.source.in (original)
+++ people/waldi/linux-2.6/debian/templates/control.source.in Tue Jan 3 19:45:41 2006
@@ -4,5 +4,5 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>, Norbert Tretkowski <nobse at debian.org>, Frederik Schüler <fs at debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.029), ocaml-interp
+Build-Depends: gcc (>= 4:4.0) [!m68k], gcc-3.3 [m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 10.029), ocaml-interp, python2.4-minimal
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto
More information about the Kernel-svn-changes
mailing list