Author: adconrad
Date: 2013-11-23 21:07:51 +0000 (Sat, 23 Nov 2013)
New Revision: 5789
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/rules.d/quilt.mk
Log:
debian/rules.d/quilt.mk: Fix unpatch with only one arch patch applied.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 18:59:44 UTC
(rev 5788)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-23 21:07:51 UTC
(rev 5789)
@@ -71,6 +71,7 @@
tst-tlsmod5.so and tst-tlsmod6.so with an as-needed default toolchain.
* debian/patches/any/local-use-glibc-predef.diff: Backport stdc-predef.h
from glibc instead of eglibc, avoiding bits/predefs.h (closes: #717557)
+ * debian/rules.d/quilt.mk: Fix unpatch with only one arch patch applied.
[ Samuel Thibault ]
* patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Rebased.
Modified: glibc-package/branches/eglibc-2.18/debian/rules.d/quilt.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules.d/quilt.mk 2013-11-23
18:59:44 UTC (rev 5788)
+++ glibc-package/branches/eglibc-2.18/debian/rules.d/quilt.mk 2013-11-23
21:07:51 UTC (rev 5789)
@@ -25,7 +25,7 @@
@if test -r debian/patches/series.$(DEB_HOST_ARCH); then \
pc=".pc.$(DEB_HOST_ARCH)"; \
QUILT_PC="$$pc" $(QUILT) upgrade || true; \
- if QUILT_PC="$$pc" $(QUILT) previous >/dev/null 2>&1; then \
+ if QUILT_PC="$$pc" $(QUILT) applied >/dev/null 2>&1; then \
echo "Unapplying architecture specific patches..."; \
QUILT_PC="$$pc" $(QUILT) pop -a -v ; \
fi ; \
@@ -34,7 +34,7 @@
rm -f $(stamp)patch
refresh: unpatch
- @if $(QUILT) previous >/dev/null 2>&1; then \
+ @if $(QUILT) applied >/dev/null 2>&1; then \
echo "Unapplying Debian patches..." ; \
$(QUILT) pop -a -v ; \
fi
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vkkqi-0007tr...@moszumanska.debian.org
