[kernel] r15373 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Sun Mar 14 22:55:16 2010
New Revision: 15373

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

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Mar 14 09:29:47 2010	(r15372)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Mar 14 22:55:16 2010	(r15373)
@@ -2,6 +2,8 @@
 
   [ 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 at decadent.org.uk>  Sat, 13 Mar 2010 23:06:49 +0000
 

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Sun Mar 14 09:29:47 2010	(r15372)
+++ dists/trunk/linux-2.6/debian/rules.real	Sun Mar 14 22:55:16 2010	(r15373)
@@ -274,7 +274,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/trunk/linux-2.6/debian/templates/control.libc-dev.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Sun Mar 14 09:29:47 2010	(r15372)
+++ dists/trunk/linux-2.6/debian/templates/control.libc-dev.in	Sun Mar 14 22:55:16 2010	(r15373)
@@ -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