Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

[dak.git] / config / backports / apt.conf

diff --git a/config/backports/apt.conf b/config/backports/apt.conf
index 6f9d67bb5dcd2c2e132d9257c9a25fdce8d2a049..0b17a106d3a788fc7cde11e59052d00120e0f325 100644 (file)
--- a/config/backports/apt.conf
+++ b/config/backports/apt.conf
@@ -7,8 +7,8 @@ Dir
 
 Default
 {
-   Packages::Compress ". gzip bzip2";
-   Sources::Compress ". gzip bzip2";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
    Contents::Compress "gzip";
@@ -29,8 +29,17 @@ tree "dists/lenny-backports"
    BinOverride "override.lenny-backports.$(SECTION)";
    ExtraOverride "override.lenny-backports.extra.$(SECTION)";
    SrcOverride "override.lenny-backports.$(SECTION).src";
-   Packages::Compress ". gzip bzip2";
-   Sources::Compress ". gzip bzip2";
+};
+
+tree "dists/lenny-backports-sloppy"
+{
+   FileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.lenny-backports.$(SECTION)";
+   ExtraOverride "override.lenny-backports.extra.$(SECTION)";
+   SrcOverride "override.lenny-backports.$(SECTION).src";
 };
 
 tree "dists/lenny-backports/main"
@@ -45,26 +54,24 @@ tree "dists/lenny-backports/main"
    Contents "$(DIST)/../Contents-udeb";
 };
 
-tree "dists/etch-backports"
+tree "dists/squeeze-backports"
 {
-   FileList "/srv/backports-master.debian.org/database/dists/etch-backports_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/backports-master.debian.org/database/dists/etch-backports_$(SECTION)_source.list";
+   FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
-   BinOverride "override.etch-backports.$(SECTION)";
-   ExtraOverride "override.etch-backports.extra.$(SECTION)";
-   SrcOverride "override.etch-backports.$(SECTION).src";
-   Packages::Compress ". gzip bzip2";
-   Sources::Compress ". gzip bzip2";
+   Architectures "amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.squeeze-backports.$(SECTION)";
+   ExtraOverride "override.squeeze-backports.extra.$(SECTION)";
+   SrcOverride "override.squeeze-backports.$(SECTION).src";
 };
 
-tree "dists/etch-backports/main"
+tree "dists/squeeze-backports/main"
 {
-   FileList "/srv/backports-master.debian.org/database/dists/etch-backports_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
-   BinOverride "override.etch-backports.main.$(SECTION)";
-   SrcOverride "override.etch-backports.main.src";
+   Architectures "amd64 armel i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.squeeze-backports.main.$(SECTION)";
+   SrcOverride "override.squeeze-backports.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";