fix FTBFS when built twice in a row

Don't unpack the FHS tarball since it overwrites our own build system and
we don't use the files inside the tarball anyway.  Don't install the FHS
files twice.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-11

diff --git a/debian/changelog b/debian/changelog
index ee068fc28bd0c972c484d464fdf8bc03a81fd694..667ad6688b77198f72d32a08f01bf0a0f936600f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-policy (3.7.3.0) UNRELEASED; urgency=low
 
+  * Bug fix: "FTBFS if built twice in a row"                 (Closes: #424212).
   * Bug fix: "[PROPOSAL] Document ~ behavior in version numbers", thanks
     to Nicolas François and Marc Brockschmidt                (Closes: #382612).
   * Bug fix: "Please add 'local' to list of supra-POSIX features that

diff --git a/debian/rules b/debian/rules
index 25541e7b05c4fcbbf3315e3609b9f3f6c060acae..e19494e664692e2eb7a6c84da8452c076bb4cd7d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -90,7 +90,6 @@ stamp-build: version.ent $(sanitycheck)
                $(SGML_FILES:=.html.tar.gz) \
                $(SGML_FILES:=.txt.gz) \
                policy.ps.gz policy.pdf.gz
-       tar -zxf $(FHS_ARCHIVE)
        # Need to use a patched tmac.m macro file if we're using a pre-1.16
        # groff; version 1.16 is apparently fixed
        if dpkg --compare-versions "$(shell dpkg -s groff | sed -n -e 's/Version: //p')" lt 1.16; then \
@@ -148,7 +147,6 @@ stamp-policy:  build $(sanitycheck)
        echo "debian-policy:Version=$(version)"      > debian/substvars
        $(install_file)     $(POLICY_FILES)          $(DOCDIR)/
 #      $(install_file)     $(FSSTND_FILES)          $(DOCDIR)/fsstnd/
-       $(install_file)     $(FHS_FILES)             $(DOCDIR)/fhs/
        $(install_file)     debian/changelog         $(DOCDIR)/
        # Be more specific with file compression
        gzip -f9            $(DOCDIR)/*.txt $(DOCDIR)/*.sgml \