From 1a7c25bf774de740f27b565482be76e5f199e2bf Mon Sep 17 00:00:00 2001 From: Bill Allombert Date: Tue, 13 Oct 2015 22:09:08 +0200 Subject: [PATCH] Use gzip -n for compressing generated files. --- Makefile | 8 ++++---- copyright-format/Makefile | 2 +- debconf_spec/Makefile | 2 +- debian/changelog | 3 ++- debian/rules | 11 ++++++----- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 4b7f62d..aa5408f 100644 --- a/Makefile +++ b/Makefile @@ -25,25 +25,25 @@ perl-policy.sgml: version.ent rmdir $*-1d.html %.html.tar.gz: %.html/index.html - tar -czf $(<:/index.html=.tar.gz) $(<:/index.html=) + GZIP=-n9 tar -czf $(<:/index.html=.tar.gz) $(<:/index.html=) %.txt: %.sgml LANG=C debiandoc2text $< %.txt.gz: %.txt - gzip -cf9 $< > $@ + gzip -ncf9 $< > $@ %.ps: %.sgml LANG=C debiandoc2latexps $< %.ps.gz: %.ps - gzip -cf9 $< > $@ + gzip -ncf9 $< > $@ %.pdf: %.sgml LANG=C debiandoc2latexpdf $< %.pdf.gz: %.pdf - gzip -cf9 $< > $@ + gzip -ncf9 $< > $@ # This is a temporary hack to fold the upgrading-checklist into the Policy # HTML directory so that it can be deployed alongside Policy on diff --git a/copyright-format/Makefile b/copyright-format/Makefile index 92ef4f3..9d03436 100644 --- a/copyright-format/Makefile +++ b/copyright-format/Makefile @@ -9,7 +9,7 @@ copyright-format-1.0.txt: copyright-format-1.0.html links -dump $< | perl -pe 's/[\r\0]//g' > $@ copyright-format-1.0.txt.gz: copyright-format-1.0.txt - gzip -cf9 $< > $@ + gzip -ncf9 $< > $@ clean: rm -f *.css *.html *.txt *.txt.gz diff --git a/debconf_spec/Makefile b/debconf_spec/Makefile index ba5c251..cd3e4a3 100644 --- a/debconf_spec/Makefile +++ b/debconf_spec/Makefile @@ -9,7 +9,7 @@ all: debconf_specification.txt.gz debconf_specification.html links -dump $< | perl -pe 's/[\r\0]//g' > $@ %.txt.gz: %.txt - gzip -cf9 $< > $@ + gzip -ncf9 $< > $@ clean: rm -f *.css *.html *.txt *.txt.gz diff --git a/debian/changelog b/debian/changelog index d48eac8..c26afda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ debian-policy (3.9.7.0) unstable; urgency=low * Policy: refreshed the names of the Policy Editors. + * Makefile: use gzip -n when compressing generated files. * Policy: Symbolic links must not traverse above the root directory. Wording: Andrey Rahmatullin Seconded: Bill Allombert @@ -32,7 +33,7 @@ debian-policy (3.9.7.0) unstable; urgency=low Seconded: Charles Plessy Closes: #106073 - -- Bill Allombert Fri, 08 May 2015 15:10:02 +0200 + -- Bill Allombert Tue, 13 Oct 2015 22:03:00 +0200 debian-policy (3.9.6.1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 689ba73..b180292 100755 --- a/debian/rules +++ b/debian/rules @@ -80,10 +80,10 @@ stamp-build: version.ent copyright-format/version.xml \ $(ORG_FILES:=.txt) $(MAKE) -C copyright-format all $(MAKE) -C debconf_spec all - GZIP=-9 cd copyright-format && \ - tar -zcf ../copyright-format.xml.tar.gz * - GZIP=-9 cd debconf_spec && \ - tar -zcf ../debconf_specification.xml.tar.gz * + cd copyright-format && \ + GZIP=-n9 tar -zcf ../copyright-format.xml.tar.gz * + cd debconf_spec && \ + GZIP=-n9 tar -zcf ../debconf_specification.xml.tar.gz * touch stamp-build # Create the version files for inclusion in the various documents. We want @@ -162,7 +162,8 @@ stamp-binary: stamp-build # # Compress files and build MD5 checksums. # - gzip -f9 $(DOCDIR)/*.txt $(DOCDIR)/*.sgml $(DOCDIR)/changelog + gzip -f9 $(DOCDIR)/*.sgml $(DOCDIR)/changelog + gzip -f9 -n $(DOCDIR)/*.txt @set -ex; cd debian/tmp; \ find . -path './DEBIAN' -prune -o -type f -printf '%P\0' \ | xargs -r0 md5sum > DEBIAN/md5sums -- 2.39.2