r3593 - in glibc-package/trunk/debian: . rules.d
Author: aurel32
Date: 2009-07-05 22:43:03 +0000 (Sun, 05 Jul 2009)
New Revision: 3593
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Don't ship /usr/include/scsi/scsi.h anymore. Closes: #535809.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-07-05 17:54:53 UTC (rev 3592)
+++ glibc-package/trunk/debian/changelog 2009-07-05 22:43:03 UTC (rev 3593)
@@ -1,9 +1,13 @@
eglibc (2.9-20) UNSTABLE; urgency=low
+ [ Clint Adams ]
* Bump to Standards-Version 3.8.2.
- -- Clint Adams <schizo@debian.org> Sun, 05 Jul 2009 13:51:51 -0400
+ [ Aurelien Jarno ]
+ * Don't ship /usr/include/scsi/scsi.h anymore. Closes: #535809.
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 06 Jul 2009 00:42:27 +0200
+
eglibc (2.9-19) unstable; urgency=low
[ Petr Salinger ]
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2009-07-05 17:54:53 UTC (rev 3592)
+++ glibc-package/trunk/debian/rules.d/build.mk 2009-07-05 22:43:03 UTC (rev 3593)
@@ -136,6 +136,9 @@
$(MAKE) -C $(DEB_BUILDDIR) \
install_root=$(CURDIR)/debian/tmp-$(curpass) install
+ # Remove files already provided by linux-libc-dev
+ rm -f $(CURDIR)/debian/tmp-$(curpass)/usr/include/scsi/scsi.h
+
# Generate the list of SUPPORTED locales
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=localedata/SUPPORTED \
Reply to: