[kernel] r17862 - in dists/sid/linux-latest-2.6: . debian debian/bin debian/po debian/templates
Ben Hutchings
benh at alioth.debian.org
Thu Jul 28 21:30:39 UTC 2011
Author: benh
Date: Thu Jul 28 21:30:38 2011
New Revision: 17862
Log:
Merge linux-latest-2.6 changes from trunk
Added:
dists/sid/linux-latest-2.6/debian/po/templates.pot
- copied unchanged from r17861, dists/trunk/linux-latest-2.6/debian/po/templates.pot
Modified:
dists/sid/linux-latest-2.6/ (props changed)
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/rules.real
dists/sid/linux-latest-2.6/debian/templates/control.doc.latest.in
dists/sid/linux-latest-2.6/debian/templates/control.extra.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.source.in
dists/sid/linux-latest-2.6/debian/templates/control.source.latest.in
dists/sid/linux-latest-2.6/debian/templates/control.tools.latest.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 Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py Thu Jul 28 21:30:38 2011 (r17862)
@@ -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,
}
@@ -36,14 +35,14 @@
['linux-support-%s%s' % (self.version.linux_upstream, self.abiname)]
)
- latest_source = self.templates["control.source.latest"][0]
- packages.append(self.process_package(latest_source, vars))
+ latest_source = self.templates["control.source.latest"]
+ packages.extend(self.process_packages(latest_source, vars))
- latest_doc = self.templates["control.doc.latest"][0]
- packages.append(self.process_package(latest_doc, vars))
+ latest_doc = self.templates["control.doc.latest"]
+ packages.extend(self.process_packages(latest_doc, vars))
- latest_tools = self.templates["control.tools.latest"][0]
- packages.append(self.process_package(latest_tools, vars))
+ latest_tools = self.templates["control.tools.latest"]
+ packages.extend(self.process_packages(latest_tools, vars))
def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
if self.version.linux_modifier is None:
@@ -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']
@@ -66,8 +66,6 @@
templates.extend(self.templates["control.image.latest.type-modules"])
else:
templates.extend(self.templates["control.image.latest.type-standalone"])
- if featureset == 'xen':
- templates.extend(self.templates["control.xen-linux-system.latest"])
if config_base.get('modules', True):
templates.extend(self.templates["control.headers.latest"])
@@ -83,11 +81,13 @@
desc.append(config_description['part-long-' + part])
desc.append_short(config_description.get('part-short-' + part, ''))
+ if 'xen' in desc_parts:
+ templates.extend(self.templates["control.xen-linux-system.latest"])
+
packages_dummy = []
packages_dummy.append(self.process_real_image(templates[0], image_fields, vars))
- packages_dummy.append(self.process_real_image(templates[1], image_fields, vars))
- packages_dummy.extend(self.process_packages(templates[2:], vars))
+ packages_dummy.extend(self.process_packages(templates[1:], vars))
for package in packages_dummy:
name = package['Package']
Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/changelog Thu Jul 28 21:30:38 2011 (r17862)
@@ -1,3 +1,32 @@
+linux-latest-2.6 (39) unstable; urgency=low
+
+ * Update to 3.0.0-1
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sun, 24 Jul 2011 16:06:56 +0200
+
+linux-latest-2.6 (38) experimental; urgency=low
+
+ * Correct xen-linux-system transitional package names
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 29 Jun 2011 03:52:35 +0100
+
+linux-latest-2.6 (37) experimental; urgency=low
+
+ * Update to 3.0.0-rc5
+ * Restore xen-linux-system-<flavour> packages
+ * Remove common description text from linux-image-2.6-<flavour> packages
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 29 Jun 2011 03:24:50 +0100
+
+linux-latest-2.6 (36) experimental; urgency=low
+
+ * Update to 3.0.0-rc1
+ - Add linux-doc, linux-headers-<flavour>, linux-source and linux-tools
+ packages
+ - Change *-2.6-* to transitional packages
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 02 Jun 2011 04:37:28 +0100
+
linux-latest-2.6 (35.1) unstable; urgency=low
[ Bastian Blank ]
Copied: dists/sid/linux-latest-2.6/debian/po/templates.pot (from r17861, dists/trunk/linux-latest-2.6/debian/po/templates.pot)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-latest-2.6/debian/po/templates.pot Thu Jul 28 21:30:38 2011 (r17862, copy of r17861, dists/trunk/linux-latest-2.6/debian/po/templates.pot)
@@ -0,0 +1,42 @@
+# debconf templates for linux-latest-2.6; translation into LANGUAGE.
+# Copyright YEAR TRANSLATION COPYRIGHT HOLDER
+# This file is distributed under the same license as the linux-latest-2.6
+# package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-latest-2.6 VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-24 16:15+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid "This system requires a different kernel configuration"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid ""
+"Debian's '686' kernel configuration has been replaced by the '686-pae' "
+"configuration, which uses PAE (Physical Address Extension). However, the "
+"CPU in this system does not support PAE."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../linux-image-686.templates:1001
+msgid ""
+"You should install linux-image-486 and remove linux-image-686 and/or linux-"
+"image-2.6-686 if they are currently installed."
+msgstr ""
Modified: dists/sid/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.defs Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/rules.defs Thu Jul 28 21:30:38 2011 (r17862)
@@ -1 +1 @@
-KERNELVERSION := 2.6.39-2
+KERNELVERSION := 3.0.0-1
Modified: dists/sid/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.real Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/rules.real Thu Jul 28 21:30:38 2011 (r17862)
@@ -11,6 +11,9 @@
binary-indep: install-doc
binary-indep: install-source
binary-indep: install-tools
+binary-indep: install-doc-2.6
+binary-indep: install-source-2.6
+binary-indep: install-tools-2.6
install-base:
dh_bugfiles
@@ -30,20 +33,38 @@
dh_prep
$(MAKE) -f debian/rules.real install-base
-install-doc: PACKAGE_NAME = linux-doc-2.6
+install-doc: PACKAGE_NAME = linux-doc
install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
install-doc:
dh_prep
- $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
+ $(MAKE) -f debian/rules.real install-base
-install-source: PACKAGE_NAME = linux-source-2.6
+install-source: PACKAGE_NAME = linux-source
install-source: DH_OPTIONS = -p$(PACKAGE_NAME)
install-source:
dh_prep
- $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
+ $(MAKE) -f debian/rules.real install-base
-install-tools: PACKAGE_NAME = linux-tools-2.6
+install-tools: PACKAGE_NAME = linux-tools
install-tools: DH_OPTIONS = -p$(PACKAGE_NAME)
install-tools:
dh_prep
$(MAKE) -f debian/rules.real install-base
+
+install-doc-2.6: PACKAGE_NAME = linux-doc-2.6
+install-doc-2.6: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-doc-2.6:
+ dh_prep
+ $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
+
+install-source-2.6: PACKAGE_NAME = linux-source-2.6
+install-source-2.6: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-source-2.6:
+ dh_prep
+ $(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
+
+install-tools-2.6: PACKAGE_NAME = linux-tools-2.6
+install-tools-2.6: DH_OPTIONS = -p$(PACKAGE_NAME)
+install-tools-2.6:
+ dh_prep
+ $(MAKE) -f debian/rules.real install-base
Modified: dists/sid/linux-latest-2.6/debian/templates/control.doc.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.doc.latest.in Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.doc.latest.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/sid/linux-latest-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.extra.in Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.extra.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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,17 @@
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.
+
+Package: xen-linux-system-2.6-xen-686
+Architecture: i386
+Depends: xen-linux-system-686-pae, ${misc:Depends}
+Description: Xen system with Linux for modern PCs (dummy package)
+ This is a dummy transitional package. It can be safely removed.
+
+Package: xen-linux-system-2.6-xen-amd64
+Architecture: amd64
+Depends: xen-linux-system-amd64, ${misc:Depends}
+Description: Xen system with Linux for 64-bit PCs (dummy package)
This is a dummy transitional package. It can be safely removed.
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 Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.headers.latest.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/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 Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/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 Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/sid/linux-latest-2.6/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.source.in Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.source.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/sid/linux-latest-2.6/debian/templates/control.source.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.source.latest.in Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.source.latest.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/sid/linux-latest-2.6/debian/templates/control.tools.latest.in
==============================================================================
--- dists/sid/linux-latest-2.6/debian/templates/control.tools.latest.in Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.tools.latest.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -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/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 Thu Jul 28 09:37:10 2011 (r17861)
+++ dists/sid/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in Thu Jul 28 21:30:38 2011 (r17862)
@@ -1,6 +1,6 @@
-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.
More information about the Kernel-svn-changes
mailing list