diff --git a/debian/changelog b/debian/changelog index 78c61bcac..2cf907ce2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sat, 13 Mar 2010 23:06:49 +0000 diff --git a/debian/rules.real b/debian/rules.real index 0743b0ea1..78b300053 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -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 diff --git a/debian/templates/control.libc-dev.in b/debian/templates/control.libc-dev.in index 6e4a80521..6e3447393 100644 --- a/debian/templates/control.libc-dev.in +++ b/debian/templates/control.libc-dev.in @@ -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