From: James Troup Date: Tue, 13 Feb 2007 01:13:03 +0000 (+0000) Subject: [rmurray] change default compression scheme for both Sources and Packages to gzip... X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f483d58362c6683b9d36d4d8846a9f528312ef58;p=dak.git [rmurray] change default compression scheme for both Sources and Packages to gzip and bzip2 rather than uncompressed and gzip (Packages) and gzip (Sources). Use old defaults for proposed-updates. --- diff --git a/ChangeLog b/ChangeLog index f9f45f97..0b8578a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-02-08 Ryan Murray + * config/debian/apt.conf: change default compression scheme for + both Sources and Packages to gzip and bzip2 rather than + uncompressed and gzip (Packages) and gzip (Sources). Use old + defaults for proposed-updates. + * dak/control_overrides.py (main): refuse to operate on untouchable suites. diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 4ec1cd2c..8e9dbbe1 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -7,8 +7,8 @@ Dir Default { - Packages::Compress ". gzip"; - Sources::Compress "gzip"; + Packages::Compress "gzip bzip2"; + Sources::Compress "gzip bzip2"; Contents::Compress "gzip"; DeLinkLimit 0; MaxContentsChange 25000; @@ -30,6 +30,8 @@ tree "dists/proposed-updates" ExtraOverride "override.sarge.extra.$(SECTION)"; SrcOverride "override.sarge.$(SECTION).src"; Contents " "; + Packages::Compress ". gzip"; + Sources::Compress "gzip"; }; tree "dists/testing" @@ -42,8 +44,6 @@ tree "dists/testing" BinOverride "override.etch.$(SECTION)"; ExtraOverride "override.etch.extra.$(SECTION)"; SrcOverride "override.etch.$(SECTION).src"; - Packages::Compress ". gzip bzip2"; - Sources::Compress "gzip bzip2"; }; tree "dists/testing-proposed-updates" @@ -67,8 +67,6 @@ tree "dists/unstable" BinOverride "override.sid.$(SECTION)"; ExtraOverride "override.sid.extra.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; - Packages::Compress ". gzip bzip2"; - Sources::Compress "gzip bzip2"; }; // debian-installer @@ -83,6 +81,8 @@ tree "dists/proposed-updates/main" BinCacheDB "packages-debian-installer-$(ARCH).db"; Packages::Extensions ".udeb"; Contents " "; + Packages::Compress ". gzip"; + Sources::Compress "gzip"; }; tree "dists/testing/main"