Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it again (Closes: #572067)

svn path=/dists/trunk/linux-2.6/; revision=15373
This commit is contained in:
Ben Hutchings 2010-03-14 22:55:16 +00:00
parent 8487903ed9
commit f92b888553
3 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ linux-2.6 (2.6.33-1~experimental.4) UNRELEASED; urgency=low
[ Ben Hutchings ]
* Include aufs2, marked as staging (Closes: #573189)
* Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it
again (Closes: #572067)
-- Ben Hutchings <ben@decadent.org.uk> Sat, 13 Mar 2010 23:06:49 +0000

2
debian/rules.real vendored
View File

@ -274,7 +274,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