r6330 - in glibc-package/trunk/debian: . rules.d
Author: adconrad
Date: 2014-11-10 22:16:03 +0000 (Mon, 10 Nov 2014)
New Revision: 6330
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/tarball.mk
Log:
debian/rules.d/tarball.mk: Fix update-from-upstream manual/* filter rule.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2014-11-07 14:21:13 UTC (rev 6329)
+++ glibc-package/trunk/debian/changelog 2014-11-10 22:16:03 UTC (rev 6330)
@@ -4,6 +4,9 @@
* patches/hurd-i386/libpthread_spin-lock.diff: New patch to fix spin-lock.h
inclusion order.
+ [ Adam Conrad ]
+ * debian/rules.d/tarball.mk: Fix update-from-upstream manual/* filter rule.
+
-- Samuel Thibault <sthibault@debian.org> Fri, 07 Nov 2014 13:48:08 +0000
glibc (2.19-13) unstable; urgency=medium
Modified: glibc-package/trunk/debian/rules.d/tarball.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/tarball.mk 2014-11-07 14:21:13 UTC (rev 6329)
+++ glibc-package/trunk/debian/rules.d/tarball.mk 2014-11-10 22:16:03 UTC (rev 6330)
@@ -21,5 +21,5 @@
git clone --bare $(GLIBC_GIT) $(GLIBC_CHECKOUT)
echo "GIT update of $(GLIBC_GIT)/$(GLIBC_BRANCH) from $(DEB_ORIG_COMMIT)" > $(GIT_UPDATES_DIFF)
echo "" >> $(GIT_UPDATES_DIFF)
- (cd $(GLIBC_CHECKOUT) && git diff $(GLIBC_TAG) $(GLIBC_BRANCH)) | filterdiff -x 'manual/*' >> $(GIT_UPDATES_DIFF)
+ (cd $(GLIBC_CHECKOUT) && git diff $(GLIBC_TAG) $(GLIBC_BRANCH)) | filterdiff -x '*/manual/*' >> $(GIT_UPDATES_DIFF)
rm -rf $(GLIBC_CHECKOUT)
Reply to: