Author: waldi
Date: Wed Sep 26 19:11:30 2007
New Revision: 9558
Log:
* debian/changelog: Update.
* debian/rules.real, debian/templates/control.headers.featureset.in:
Add -common to header package names.
* debian/templates/control.headers.in
- Add -common to package name.
- Drop provides.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
dists/trunk/linux-2.6/debian/templates/control.headers.in
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Sep 26 19:11:30 2007
@@ -52,6 +52,8 @@
- Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support
- Broadcom Tigon3 support
- USB Keyspan USA-xxx Serial Driver
+ * Add -common to common header package names.
+ * Drop provides from common header packages.
[ Aurelien Jarno ]
* [mips, mipsel] Add a 64-bit image (5kc-malta) for the MIPS Malta board.
@@ -63,7 +65,7 @@
* Move new global options into the global config file
* Clean up new amd64 options
- -- Bastian Blank <[EMAIL PROTECTED]> Sat, 15 Sep 2007 21:25:41 +0200
+ -- Bastian Blank <[EMAIL PROTECTED]> Wed, 26 Sep 2007 21:09:13 +0200
linux-2.6 (2.6.22-5) UNRELEASED; urgency=low
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real (original)
+++ dists/trunk/linux-2.6/debian/rules.real Wed Sep 26 19:11:30 2007
@@ -216,7 +216,7 @@
dh_testroot
$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
-install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET): PACKAGE_NAME =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)-common$(LOCALVERSION_HEADERS)
install-headers_$(ARCH)_$(FEATURESET): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET): BASE_DIR = /usr/src/$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET): SOURCE_DIR =
$(BUILD_DIR)/source_$(ARCH)_$(FEATURESET)
@@ -247,7 +247,7 @@
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION =
$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME =
linux-headers-$(REAL_VERSION)
-install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_HEADERS =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
+install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_HEADERS =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)-common$(LOCALVERSION_HEADERS)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME_KBUILD =
linux-kbuild-$(VERSION)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DH_OPTIONS =
-p$(PACKAGE_NAME)
install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): BASE_DIR =
/usr/src/$(PACKAGE_NAME)
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.featureset.in
Wed Sep 26 19:11:30 2007
@@ -1,7 +1,6 @@
-Package: [EMAIL PROTECTED]@@abiname@@localversion_headers@
+Package: [EMAIL PROTECTED]@@[EMAIL PROTECTED]@localversion_headers@
Section: devel
Priority: optional
-Provides: linux-headers, [EMAIL PROTECTED]@
Description: Common header files for Linux @upstreamversion@
This package provides the architecture-specific common kernel header files
for Linux kernel version @upstreamversion@, generally used for building
out-of-tree
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.in (original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.in Wed Sep 26
19:11:30 2007
@@ -1,7 +1,7 @@
Package: [EMAIL PROTECTED]@@abiname@@localversion@
Section: devel
Priority: optional
-Depends: [EMAIL PROTECTED]@@abiname@@localversion_headers@ (=
${Source-Version}), [EMAIL PROTECTED]@
+Depends: [EMAIL PROTECTED]@@[EMAIL PROTECTED]@localversion_headers@ (=
${Source-Version}), [EMAIL PROTECTED]@
Provides: linux-headers, [EMAIL PROTECTED]@
Description: Header files for Linux @upstreamversion@ on @class@
This package provides the architecture-specific kernel header files
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
