Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it again

svn path=/dists/sid/linux-2.6/; revision=15374
This commit is contained in:
Ben Hutchings 2010-03-14 23:09:37 +00:00
parent 3a1683af77
commit 7fe949a47c
3 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View File

@ -41,6 +41,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low
* firmware: Correct copyright information and add source for CIS files
* Fix first line of kernel-doc for a few functions so that they get valid
manual pages
* Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it
again
-- maximilian attems <maks@debian.org> Thu, 25 Feb 2010 13:07:47 +0100

2
debian/rules.real vendored
View File

@ -280,7 +280,7 @@ install-libc-dev_$(ARCH):
+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_check ARCH=$(KERNEL_ARCH)
+$(MAKE_CLEAN) -C $(SOURCE_DIR) O='$(CURDIR)/$(DIR)' headers_install ARCH=$(KERNEL_ARCH) INSTALL_HDR_PATH='$(CURDIR)'/$(OUT_DIR)
rm -rf $(OUT_DIR)/include/scsi
rm -rf $(OUT_DIR)/include/drm $(OUT_DIR)/include/scsi
find $(OUT_DIR)/include \( -name .install -o -name ..install.cmd \) -execdir rm {} +
+$(MAKE_SELF) install-base

View File

@ -1,7 +1,7 @@
Package: linux-libc-dev
Section: devel
Provides: linux-kernel-headers
Replaces: linux-kernel-headers, libdrm-dev (<= 2.4.5-1)
Replaces: linux-kernel-headers
Conflicts: linux-kernel-headers
Description: Linux support headers for userspace development
This package provides userspaces headers from the Linux kernel. These headers