From 7fe949a47c34f03df35ac323ed068b24dbeee536 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 14 Mar 2010 23:09:37 +0000 Subject: [PATCH] Remove /usr/include/drm from linux-libc-dev; let libdrm-dev provide it again svn path=/dists/sid/linux-2.6/; revision=15374 --- debian/changelog | 2 ++ debian/rules.real | 2 +- debian/templates/control.libc-dev.in | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c428f857..5b76c2025 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 25 Feb 2010 13:07:47 +0100 diff --git a/debian/rules.real b/debian/rules.real index 98db3939b..7aaf825df 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -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 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