X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapt.conf;h=d27a545a9951110ce28f2d54e4bbdb9498eff545;hb=bf7e1ddfb0bc42efad1d58b7010298919f65ecca;hp=4ec1cd2cead93c79d2543772b888a3540a172392;hpb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;p=dak.git

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 4ec1cd2c..d27a545a 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"
@@ -97,6 +97,18 @@ tree "dists/testing/main"
    Contents "$(DIST)/../Contents-udeb";
 };
 
+tree "dists/testing/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
+   BinOverride "override.etch.main.$(SECTION)";
+   SrcOverride "override.etch.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
 tree "dists/testing-proposed-updates/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
@@ -113,14 +125,50 @@ tree "dists/unstable/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb";
+};
+
+tree "dists/unstable/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
    Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
+tree "dists/experimental/main"
+{
+   FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";
 };
 
+tree "dists/experimental/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
 // Experimental
 
 tree "dists/experimental"