From 1e7a0583ac0e7884ac3453127757587911d2d574 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 8 Oct 2009 01:01:11 +0000 Subject: [PATCH] Remove /usr/include/scsi from linux-libc-dev (Closes: #550130) svn path=/dists/trunk/linux-2.6/; revision=14345 --- debian/changelog | 2 ++ debian/rules.real | 3 +++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 20d76920b..a639c95a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ linux-2.6 (2.6.31-1~experimental.2) UNRELEASED; urgency=low - 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) diff --git a/debian/rules.real b/debian/rules.real index 1a170ac67..0afa3877a 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -280,6 +280,9 @@ install-libc-dev_$(ARCH): 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)