From: Russ Allbery Date: Fri, 30 Nov 2007 03:35:30 +0000 (+0000) Subject: fix FTBFS when built twice in a row X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3ba5838c6b3c40dea09e4db60b90e5f350762555;p=debian%2Fdebian-policy.git 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 ee068fc..667ad66 100644 --- 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 25541e7..e19494e 100755 --- 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 \