Bug#373951: tetex-base: FTBFS: rerunning quilt push -a fails

[Mohammed Adnène Trojette <adn+deb@diwi.org>]

tag 373951 patch
thanks سلام שלם

On Fri, Jun 16, 2006, Daniel Schepler wrote:
> Package: tetex-base
> Version: 3.0-18
> Severity: serious
> 
> From my pbuilder build log:
> 
> ...
>  fakeroot debian/rules binary
> quilt push -a
> File series fully applied, ends at patch patch-tmp
> make: *** [stampdir/patch-stamp] Error 2

I suggest adding " || test $$? = 2" after quilt commands in
debian/rules.in. See the NMU diff here:

diff -u tetex-base-3.0/debian/changelog tetex-base-3.0/debian/changelog
--- tetex-base-3.0/debian/changelog
+++ tetex-base-3.0/debian/changelog
@@ -1,3 +1,11 @@
+tetex-base (3.0-18.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add "|| test $$? = 2" to quilt commands in debian/rules.in to avoid FTBFS
+    (closes: #373951)
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Fri, 16 Jun 2006 17:04:00 +0200
+
 tetex-base (3.0-18) unstable; urgency=low

   * Add a PDF documentation file for pst-poly which is only present as
diff -u tetex-base-3.0/debian/rules.in tetex-base-3.0/debian/rules.in
--- tetex-base-3.0/debian/rules.in
+++ tetex-base-3.0/debian/rules.in
@@ -138,7 +138,7 @@

 # quilt patch targets
 clean-patches:  debian/missingfiles.tar.gz
-       -quilt pop -a
+       -quilt pop -a || test $$? = 2
        # remove ordinary files (not dirs) from missingfiles.tar.gz
        for file in `tar -tzf debian/missingfiles.tar.gz`; do \
           test -f $$file && rm -f $$file || true; \
@@ -148,7 +148,7 @@
        rm -f $(stampdir)/patch-stamp

 $(stampdir)/patch-stamp: $(stampdir) debian/missingfiles.tar.gz
-       quilt push -a
+       quilt push -a || test $$? = 2
        tar -xzf debian/missingfiles.tar.gz
        touch $@

diff -u tetex-base-3.0/debian/rules tetex-base-3.0/debian/rules
--- tetex-base-3.0/debian/rules
+++ tetex-base-3.0/debian/rules
@@ -133,7 +133,7 @@

 # quilt patch targets
 clean-patches:  debian/missingfiles.tar.gz
-       -quilt pop -a
+       -quilt pop -a || test $$? = 2
        # remove ordinary files (not dirs) from missingfiles.tar.gz
        for file in `tar -tzf debian/missingfiles.tar.gz`; do \
           test -f $$file && rm -f $$file || true; \
@@ -143,7 +143,7 @@
        rm -f $(stampdir)/patch-stamp

 $(stampdir)/patch-stamp: $(stampdir) debian/missingfiles.tar.gz
-       quilt push -a
+       quilt push -a || test $$? = 2
        tar -xzf debian/missingfiles.tar.gz
        touch $@

I hope it helps,
-- 
adn
Mohammed Adnène Trojette