Merge branch 'master' into merge

[dak.git] / config / debian / apt.conf.oldstable

diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable
index d827a66c413b50274d47fb9bbacd62cead9cee69..5f96e405df088de723ea442b507c6d8002c626c8 100644 (file)
--- a/config/debian/apt.conf.oldstable
+++ b/config/debian/apt.conf.oldstable
@@ -1,4 +1,4 @@
-Dir 
+Dir
 {
    ArchiveDir "/srv/ftp.debian.org/ftp/";
    OverrideDir "/srv/ftp.debian.org/scripts/override/";
@@ -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;
    FileMode 0664;
@@ -24,10 +24,10 @@ tree "dists/oldstable"
    FileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.sarge.$(SECTION)";
-   ExtraOverride "override.sarge.extra.$(SECTION)";
-   SrcOverride "override.sarge.$(SECTION).src";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+   BinOverride "override.etch.$(SECTION)";
+   ExtraOverride "override.etch.extra.$(SECTION)";
+   SrcOverride "override.etch.$(SECTION).src";
 };
 
 // debian-installer
@@ -36,10 +36,23 @@ tree "dists/oldstable/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
-   BinOverride "override.sarge.main.$(SECTION)";
-   SrcOverride "override.sarge.main.src";
+   Architectures "alpha amd64 arm hppa i386 ia64 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 " ";
+   Contents "$(DIST)/../Contents-udeb";
 };
+
+tree "dists/oldstable/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 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";
+};
+