[kernel] r15374 - in dists/sid/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sun Mar 14 23:09:37 2010
New Revision: 15374

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

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/rules.real
   dists/sid/linux-2.6/debian/templates/control.libc-dev.in

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Mar 14 22:55:16 2010	(r15373)
+++ dists/sid/linux-2.6/debian/changelog	Sun Mar 14 23:09:37 2010	(r15374)
@@ -41,6 +41,8 @@
   * 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 at debian.org>  Thu, 25 Feb 2010 13:07:47 +0100
 

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Sun Mar 14 22:55:16 2010	(r15373)
+++ dists/sid/linux-2.6/debian/rules.real	Sun Mar 14 23:09:37 2010	(r15374)
@@ -280,7 +280,7 @@
 	+$(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

Modified: dists/sid/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.libc-dev.in	Sun Mar 14 22:55:16 2010	(r15373)
+++ dists/sid/linux-2.6/debian/templates/control.libc-dev.in	Sun Mar 14 23:09:37 2010	(r15374)
@@ -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