Bug#612502: texinfo: FTBFS due to running configure+build twice, fix attached

[Thorsten Glaser <tg@mirbsd.de>]

Source: texinfo
Version: 4.13a.dfsg.1-6
Severity: serious
Tags: patch
Justification: fails to build from source

Hi,

the debian/rules Makefile target "patch" is phony, that's why the
stamp file mechanism doesn't work and the build is run twice. Due
to GNU autotools fsckup, this _can_ (but not necessarily does)
result in an FTBFS.

Please apply the attached patch, tested on amd64 (works, doesn't
run twice) and m68k (fixes the FTBFS).

-- System Information:
Debian Release: 6.0
  APT prefers etch-m68k
  APT policy: (500, 'etch-m68k')
  (actually, it doesn't, but I have no idea where this comes from,
   I use unstable)
Architecture: m68k

Kernel: Linux 2.6.32-5+m68k.5-atari
Locale: LANG=C, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/mksh-static

Versions of packages texinfo depends on:
ii  libc6                   2.11.2-11+m68k.1 Embedded GNU C Library: Shared lib

texinfo recommends no packages.

Versions of packages texinfo suggests:
pn  texinfo-doc-nonfree           <none>     (no description available)
ii  texlive-base                  2009-11    TeX Live: Essential programs and f
pn  texlive-generic-recommended   <none>     (no description available)
ii  texlive-latex-base            2009-11    TeX Live: Basic LaTeX packages

-- no debconf information

diff -u texinfo-4.13a.dfsg.1/debian/changelog texinfo-4.13a.dfsg.1/debian/changelog
--- texinfo-4.13a.dfsg.1/debian/changelog
+++ texinfo-4.13a.dfsg.1/debian/changelog
@@ -1,3 +1,10 @@
+texinfo (4.13a.dfsg.1-6+m68k.1) unreleased; urgency=low
+
+  * d/rules: depend build on $(QUILT_STAMPFN) instead of patch, to fix an
+    FTBFS caused by the build target having been run twice
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Tue, 08 Feb 2011 19:23:02 +0100
+
 texinfo (4.13a.dfsg.1-6) unstable; urgency=low
 
   * update-info-dir: load not only /etc/environment, but also 
diff -u texinfo-4.13a.dfsg.1/debian/rules texinfo-4.13a.dfsg.1/debian/rules
--- texinfo-4.13a.dfsg.1/debian/rules
+++ texinfo-4.13a.dfsg.1/debian/rules
@@ -21,7 +21,7 @@
 tmpdir := $(CURDIR)/debian/tmp
 
 build: build-stamp
-build-stamp: patch
+build-stamp: $(QUILT_STAMPFN)
 	# some man scripts have been touch by the patches, so the builder
 	# will try to rebuild the man page from texi2dvi but that
 	# spits out only a warning that no tex system is installed