[kernel] r14345 - dists/trunk/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Thu Oct  8 01:01:11 2009
New Revision: 14345

Log:
Remove /usr/include/scsi from linux-libc-dev (Closes: #550130)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Oct  8 00:14:15 2009	(r14344)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Oct  8 01:01:11 2009	(r14345)
@@ -14,6 +14,8 @@
     - Clarify the differences between i386 flavours (Closes: #414690)
     - Simplify wording of the description template
   * Add stable release 2.6.31.3
+  * Remove /usr/include/scsi from linux-libc-dev; these headers are
+    provided by libc6-dev (Closes: #550130)
 
   [ maximilian attems ]
   * Add stable release 2.6.31.2 (Closes: #522828)

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Thu Oct  8 00:14:15 2009	(r14344)
+++ dists/trunk/linux-2.6/debian/rules.real	Thu Oct  8 01:01:11 2009	(r14345)
@@ -280,6 +280,9 @@
 	mkdir $(DIR)
 	+$(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
+	
 	+$(MAKE_SELF) install-base
 
 install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME)