Author: waldi
Date: Mon Apr 9 20:37:18 2007
New Revision: 8441
Modified:
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
Log:
Rename linux-libc-headers into linux-libc-dev.
* debian/rules.real
- Install linux-libc-headers.
- Fix dependencies against the source.
* debian/templates/control.headers.arch.in
- Change name of linux-libc-headers into linux-libc-dev.
- Add another round of conflicts/replaces.
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 Mon Apr 9 20:37:18 2007
@@ -58,7 +58,7 @@
# Targets
#
binary-arch-arch: install-headers-$(ARCH)
-binary-arch-arch: install-headers-libc_$(ARCH)
+binary-arch-arch: install-libc-dev_$(ARCH)
binary-arch-subarch: install-headers-$(ARCH)-$(SUBARCH)
binary-arch-flavour: install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE)
ifeq ($(MODULES),True)
@@ -174,15 +174,15 @@
$(STAMPS_DIR)/build-doc: SOURCE_DIR=$(BUILD_DIR)/source
$(STAMPS_DIR)/build-doc: DIR=$(BUILD_DIR)/build-doc
-$(STAMPS_DIR)/build-doc:
+$(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
$(setup_env) make -C '$(DIR)' $(JOBS_ARG) htmldocs mandocs
touch '$@'
-$(STAMPS_DIR)/build-headers: SOURCE_DIR = $(BUILD_DIR)/source
-$(STAMPS_DIR)/build-headers: DIR = $(BUILD_DIR)/build-headers
-$(STAMPS_DIR)/build-headers:
+$(STAMPS_DIR)/build-libc-dev: SOURCE_DIR = $(BUILD_DIR)/source
+$(STAMPS_DIR)/build-libc-dev: DIR = $(BUILD_DIR)/build-libc-dev
+$(STAMPS_DIR)/build-libc-dev: $(STAMPS_DIR)/source
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
touch '$@'
@@ -238,28 +238,6 @@
dh_testroot
$(MAKE) -f debian/rules.real install-base
GENCONTROL_ARGS='-Vkernel:Arch=$(ARCH)'
-install-headers-libc_$(ARCH): PACKAGE_NAME = linux-libc-headers
-install-headers-libc_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
-install-headers-libc_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-headers
-install-headers-libc_$(ARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/usr
-install-headers-libc_$(ARCH): $(STAMPS_DIR)/build-headers
- dh_testdir
- dh_testroot
- dh_clean -d -k
- make -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
- make -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
- # XXX: Needs to be removed from libc6-dev
- rm -rf '$(DIR)'/include/scsi
- $(MAKE) -f debian/rules.real install-base
-
-# XXX: This needs to be moved into the config
-install-headers-libc_$(ARCH): HEADERS_ARCH = $(ARCH)
-install-headers-libc_amd64 \
-install-headers-libc_i386: HEADERS_ARCH = x86_64
-install-headers-libc_hppa: HEADERS_ARCH = parisc
-install-headers-libc_mipsel: HEADERS_ARCH = mips
-install-headers-libc_sparc: HEADERS_ARCH = sparc64
-
install-headers-$(ARCH)-$(SUBARCH): PACKAGE_NAME =
linux-headers-$(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION_HEADERS)
install-headers-$(ARCH)-$(SUBARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-headers-$(ARCH)-$(SUBARCH): BASE_DIR = /usr/src/$(PACKAGE_NAME)
@@ -361,6 +339,28 @@
$(MAKE) -f debian/rules.real install-base
+install-libc-dev_$(ARCH): PACKAGE_NAME = linux-libc-dev
+install-libc-dev_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
+install-libc-dev_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-libc-dev
+install-libc-dev_$(ARCH): DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/usr
+install-libc-dev_$(ARCH): $(STAMPS_DIR)/build-libc-dev
+ dh_testdir
+ dh_testroot
+ dh_clean -d -k
+ make -C '$(SOURCE_DIR)' headers_check ARCH=$(HEADERS_ARCH)
+ make -C '$(SOURCE_DIR)' headers_install ARCH=$(HEADERS_ARCH)
INSTALL_HDR_PATH='$(DIR)'
+ # XXX: Needs to be removed from libc6-dev
+ rm -rf '$(DIR)'/include/scsi
+ $(MAKE) -f debian/rules.real install-base
+
+# XXX: This needs to be moved into the config
+install-libc-dev_$(ARCH): HEADERS_ARCH = $(ARCH)
+install-libc-dev_amd64 \
+install-libc-dev_i386: HEADERS_ARCH = x86_64
+install-libc-dev_hppa: HEADERS_ARCH = parisc
+install-libc-dev_mipsel: HEADERS_ARCH = mips
+install-libc-dev_sparc: HEADERS_ARCH = sparc64
+
install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)
install-support: DH_OPTIONS = -p$(PACKAGE_NAME)
install-support: PACKAGE_DIR = $(CURDIR)/debian/$(PACKAGE_NAME)
Modified: dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.headers.arch.in
(original)
+++ dists/trunk/linux-2.6/debian/templates/control.headers.arch.in Mon Apr
9 20:37:18 2007
@@ -1,9 +1,9 @@
-Package: linux-libc-headers
+Package: linux-libc-dev
Section: devel
Priority: optional
Provides: linux-kernel-headers
-Replaces: linux-kernel-headers
-Conflicts: linux-kernel-headers
+Replaces: linux-kernel-headers, linux-libc-headers
+Conflicts: linux-kernel-headers, linux-libc-headers
Description: Linux Kernel Headers for development
This package provides headers from the Linux kernel. These headers
are used by the installed headers for GNU glibc and other system libraries.
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
