* 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.

svn path=/dists/trunk/linux-2.6/; revision=9558
This commit is contained in:
Bastian Blank 2007-09-26 19:11:30 +00:00
parent ec7e0ade89
commit 4ba3d53322
4 changed files with 7 additions and 6 deletions

4
debian/changelog vendored
View File

@ -52,6 +52,8 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low
- 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 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low
* Move new global options into the global config file
* Clean up new amd64 options
-- Bastian Blank <waldi@debian.org> Sat, 15 Sep 2007 21:25:41 +0200
-- Bastian Blank <waldi@debian.org> Wed, 26 Sep 2007 21:09:13 +0200
linux-2.6 (2.6.22-5) UNRELEASED; urgency=low

4
debian/rules.real vendored
View File

@ -216,7 +216,7 @@ install-headers_$(ARCH):
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): $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET
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)

View File

@ -1,7 +1,6 @@
Package: linux-headers-@upstreamversion@@abiname@@localversion_headers@
Package: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@
Section: devel
Priority: optional
Provides: linux-headers, linux-headers-@major@
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

View File

@ -1,7 +1,7 @@
Package: linux-headers-@upstreamversion@@abiname@@localversion@
Section: devel
Priority: optional
Depends: linux-headers-@upstreamversion@@abiname@@localversion_headers@ (= ${Source-Version}), linux-kbuild-@version@
Depends: linux-headers-@upstreamversion@@abiname@-common@localversion_headers@ (= ${Source-Version}), linux-kbuild-@version@
Provides: linux-headers, linux-headers-@major@
Description: Header files for Linux @upstreamversion@ on @class@
This package provides the architecture-specific kernel header files