[kernel] r18558 - in dists/squeeze-backports/linux-latest-2.6: . debian debian/bin debian/po debian/templates
Ben Hutchings
benh at alioth.debian.org
Wed Jan 18 04:29:19 UTC 2012
Author: benh
Date: Wed Jan 18 04:29:18 2012
New Revision: 18558
Log:
Update to version 41
I'm not sure how I managed to branch at an earlier version in the first place.
Added:
dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.config
- copied unchanged from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.config
dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.postinst
- copied unchanged from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.postinst
dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.templates
- copied unchanged from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.templates
dists/squeeze-backports/linux-latest-2.6/debian/po/
- copied from r18284, dists/sid/linux-latest-2.6/debian/po/
Modified:
dists/squeeze-backports/linux-latest-2.6/ (props changed)
dists/squeeze-backports/linux-latest-2.6/debian/ (props changed)
dists/squeeze-backports/linux-latest-2.6/debian/bin/gencontrol.py
dists/squeeze-backports/linux-latest-2.6/debian/changelog
dists/squeeze-backports/linux-latest-2.6/debian/rules
dists/squeeze-backports/linux-latest-2.6/debian/rules.defs
dists/squeeze-backports/linux-latest-2.6/debian/rules.real
dists/squeeze-backports/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.doc.latest.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.extra.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.headers.latest.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.latest.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.tools.latest.in
dists/squeeze-backports/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
Modified: dists/squeeze-backports/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/bin/gencontrol.py Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/bin/gencontrol.py Wed Jan 18 04:29:18 2012 (r18558)
@@ -8,6 +8,8 @@
from debian_linux.gencontrol import Gencontrol as Base
from debian_linux.utils import Templates
+import os.path, re
+
class Gencontrol(Base):
def __init__(self, config):
super(Gencontrol, self).__init__(ConfigCoreDump(fp = file(config)), Templates(["debian/templates"]))
@@ -19,29 +21,28 @@
'upstreamversion': self.version.linux_upstream,
'version': self.version.linux_version,
'source_upstream': self.version.upstream,
- 'major': self.version.linux_major,
'abiname': self.abiname,
}
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"][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:
@@ -55,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']
@@ -64,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"])
@@ -81,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']
@@ -98,9 +100,9 @@
makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
- cmds_binary_arch = ["ln -sf linux-image.NEWS debian/%s.NEWS" % i['Package']
- for i in packages_dummy
- if i['Package'].startswith('linux-image-')]
+ cmds_binary_arch = []
+ for i in packages_dummy:
+ cmds_binary_arch += self.get_link_commands(i, ['NEWS'])
cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
@@ -130,6 +132,7 @@
version = '-v1:%s' % self.package_version
else:
version = '-v%s' % self.package_version
+ cmds += self.get_link_commands(i, ['config', 'postinst', 'templates'])
cmds.append("$(MAKE) -f debian/rules.real install-dummy ARCH='%s' DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (arch, i['Package'], version))
makefile.add('binary-arch_%s' % arch, ['binary-arch_%s_extra' % arch])
makefile.add("binary-arch_%s_extra" % arch, cmds = cmds)
@@ -144,5 +147,26 @@
entry[key] = value
return entry
+ @staticmethod
+ def get_link_commands(package, names):
+ cmds = []
+ for name in names:
+ match = re.match(r'^(linux-\w+)(-2.6)?(-.*)$', package['Package'])
+ if not match:
+ continue
+ if match.group(2):
+ source = 'debian/%s%s.%s' % (match.group(1), match.group(3),
+ name)
+ else:
+ source = None
+ if not (source and os.path.isfile(source)):
+ source = 'debian/%s.%s' % (match.group(1), name)
+ dest = 'debian/%s.%s' % (package['Package'], name)
+ if (os.path.isfile(source) and
+ (not os.path.isfile(dest) or os.path.islink(dest))):
+ cmds.append('ln -sf %s %s' %
+ (os.path.relpath(source, 'debian'), dest))
+ return cmds
+
if __name__ == '__main__':
Gencontrol(sys.argv[1] + "/config.defines.dump")()
Modified: dists/squeeze-backports/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/changelog Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/changelog Wed Jan 18 04:29:18 2012 (r18558)
@@ -1,3 +1,66 @@
+linux-latest-2.6 (41) unstable; 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 07:10:35 +0000
+
+linux-latest-2.6 (40) unstable; urgency=low
+
+ * Add debconf template translations:
+ - Serbian cyrillic (Zlatan Todoric) (Closes: #635893)
+ - German (Holger Wansing) (Closes: #637764)
+ - French (Debian French l10n team) (Closes: #636624)
+ - Swedish (Martin Bagge) (Closes: #640058)
+ - Dutch (Jeroen Schot) (Closes: #640115)
+ - Catalan (Innocent De Marchi) (Closes: #642109)
+ * Update to 3.0.0-2
+
+ -- Ben Hutchings <ben at decadent.org.uk> Thu, 06 Oct 2011 04:36:45 +0100
+
+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 ]
+ * Update to 2.6.39-2.
+
+ -- Ben Hutchings <ben at decadent.org.uk> Wed, 08 Jun 2011 23:57:09 +0100
+
+linux-latest-2.6 (35) unstable; urgency=low
+
+ * Update to 2.6.39-1
+ - Change linux-image{,-2.6}-686{,-bigmem} to transitional packages
+
+ -- Ben Hutchings <ben at decadent.org.uk> Sat, 21 May 2011 03:52:15 +0100
+
linux-latest-2.6 (34) unstable; urgency=low
* [hppa] Update to 2.6.38-2a
Copied: dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.config (from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.config)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.config Wed Jan 18 04:29:18 2012 (r18558, copy of r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.config)
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+if ! grep -q '^flags.*\bpae\b' /proc/cpuinfo; then
+ . /usr/share/debconf/confmodule
+ db_input critical linux-image-686/no-pae
+ db_go
+ exit 1
+fi
+
+#DEBHELPER#
Copied: dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.postinst (from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.postinst)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.postinst Wed Jan 18 04:29:18 2012 (r18558, copy of r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.postinst)
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+# Invoke config if necessary
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
Copied: dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.templates (from r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.templates)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze-backports/linux-latest-2.6/debian/linux-image-686.templates Wed Jan 18 04:29:18 2012 (r18558, copy of r18284, dists/sid/linux-latest-2.6/debian/linux-image-686.templates)
@@ -0,0 +1,9 @@
+Template: linux-image-686/no-pae
+Type: error
+_Description: This system requires a different kernel configuration
+ 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.
+ .
+ You should install linux-image-486 and remove linux-image-686 and/or
+ linux-image-2.6-686 if they are currently installed.
Modified: dists/squeeze-backports/linux-latest-2.6/debian/rules
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/rules Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/rules Wed Jan 18 04:29:18 2012 (r18558)
@@ -2,10 +2,64 @@
SHELL := sh -e
include debian/rules.defs
-include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
GENCONTROL = debian/bin/gencontrol.py
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+__BINNMU := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*\+b([0-9]+)$$,\1,p')
+
+BUILD_STAMP = $(STAMPS_DIR)/build-base
+
+build: debian/control $(BUILD_STAMP)
+$(BUILD_STAMP): $(BUILD_DIR) $(STAMPS_DIR)
+ dh_testdir
+ $(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
+ touch $@
+
+$(BUILD_DIR) $(STAMPS_DIR):
+ @[ -d $@ ] || mkdir $@
+
+clean: debian/control
+ dh_testdir
+ rm -rf $(BUILD_DIR) $(STAMPS_DIR)
+ dh_clean
+ find debian -maxdepth 1 -type l -delete
+
+binary-indep:
+ dh_testdir
+ $(MAKE) -f debian/rules.gen binary-indep
+
+binary-arch:
+ dh_testdir
+ $(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
+
+binary: binary-indep binary-arch
+
+CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*)
+debian/control debian/rules.gen: $(GENCONTROL) $(CONTROL_FILES)
+ifeq ($(wildcard debian/control.md5sum),)
+ $(MAKE) -f debian/rules debian/control-real
+else ifeq ($(__BINNMU),)
+ md5sum --check debian/control.md5sum --status || \
+ $(MAKE) -f debian/rules debian/control-real
+else
+ grep -v debian/changelog debian/control.md5sum | md5sum --check - --status || \
+ $(MAKE) -f debian/rules debian/control-real
+endif
+
+debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
+ $(GENCONTROL) /usr/src/linux-support-$(KERNELVERSION)
+ md5sum $^ > debian/control.md5sum
+ @echo
+ @echo This target is made to fail intentionally, to make sure
+ @echo that it is NEVER run during the automated build. Please
+ @echo ignore the following error, the debian/control file has
+ @echo been generated SUCCESSFULLY.
+ @echo
+ exit 1
+
ifdef DEBIAN_KERNEL_BUILD_ANY
binary-arch: binary-arch-all
endif
@@ -18,3 +72,4 @@
-rm debian/control debian/control.md5sum debian/rules.gen
rm -f debian/*.bug-presubj
+.PHONY: clean build binary-indep binary-arch binary
Modified: dists/squeeze-backports/linux-latest-2.6/debian/rules.defs
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/rules.defs Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/rules.defs Wed Jan 18 04:29:18 2012 (r18558)
@@ -1 +1,4 @@
-KERNELVERSION := 2.6.38-2
+BUILD_DIR = debian/build
+STAMPS_DIR = debian/stamps
+TEMPLATES_DIR = debian/templates
+KERNELVERSION := 3.1.0-1
Modified: dists/squeeze-backports/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/rules.real Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/rules.real Wed Jan 18 04:29:18 2012 (r18558)
@@ -11,9 +11,13 @@
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
+ dh_installdebconf
dh_installchangelogs
dh_installdocs
dh_compress
@@ -29,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/squeeze-backports/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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/squeeze-backports/linux-latest-2.6/debian/templates/control.doc.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.doc.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.doc.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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/squeeze-backports/linux-latest-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.extra.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.extra.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -0,0 +1,35 @@
+Package: linux-image-686
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux for modern PCs (dummy package)
+ This is a dummy transitional package. It can be safely removed.
+
+Package: linux-image-2.6-686
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux for modern PCs (dummy package)
+ This is a dummy transitional package. It can be safely removed.
+
+Package: linux-image-686-bigmem
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+Description: Linux for PCs with 4GB+ RAM (dummy package)
+ This is a dummy transitional package. It can be safely removed.
+
+Package: linux-image-2.6-686-bigmem
+Architecture: i386
+Depends: linux-image-686-pae, ${misc:Depends}
+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/squeeze-backports/linux-latest-2.6/debian/templates/control.headers.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.headers.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.headers.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -1,7 +1,11 @@
-Package: linux-headers- at major@@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)
+Package: linux-headers at localversion@
+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
- 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/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-modules.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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 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@
+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 .
-
-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/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.image.latest.type-standalone.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -1,13 +1,11 @@
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 .
-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/squeeze-backports/linux-latest-2.6/debian/templates/control.source.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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/squeeze-backports/linux-latest-2.6/debian/templates/control.source.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.source.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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/squeeze-backports/linux-latest-2.6/debian/templates/control.tools.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.tools.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.tools.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -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/squeeze-backports/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
==============================================================================
--- dists/squeeze-backports/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in Wed Jan 18 04:25:27 2012 (r18557)
+++ dists/squeeze-backports/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in Wed Jan 18 04:29:18 2012 (r18558)
@@ -1,6 +1,6 @@
-Package: xen-linux-system- at major@@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)
+Package: xen-linux-system at localversion@
+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
- @major@@localversion at .
+ @flavour@ configuration.
More information about the Kernel-svn-changes
mailing list