X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf;h=859ea6cb52207857a683e8550fd8cfec9971b2e4;hb=c5617d291dc17395a9d23c757d7dc815f6eed49e;hp=4fa969b9828cf60dbed04fd3795ed5bdb20f6dcb;hpb=30b3579ed7ed23f0c8d7b48ec98fec5a6dd062a7;p=dak.git

diff --git a/apt.conf b/apt.conf
index 4fa969b9..859ea6cb 100644
--- a/apt.conf
+++ b/apt.conf
@@ -11,7 +11,7 @@ Default
    Sources::Compress "gzip";
    Contents::Compress "gzip";
    DeLinkLimit 0;
-   MaxContentsChange 6000;
+   MaxContentsChange 12000;
    FileMode 0664;
 }
 
@@ -20,26 +20,39 @@ TreeDefault
    Contents::Header "/org/ftp.debian.org/katie/Contents.top";
 };
 
-tree "dists/testing"
+tree "dists/proposed-updates"
 {
-   FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
+   FileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa i386 ia64 m68k powerpc sparc source";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.woody.$(SECTION)";
    ExtraOverride "override.woody.extra.$(SECTION)";
    SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
+};
+
+tree "dists/testing"
+{
+   FakeDI "dists/unstable";
+   FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/testing_$(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";
 };
 
-tree "dists/woody-proposed-updates"
+tree "dists/testing-proposed-updates"
 {
-   FileList "/org/ftp.debian.org/database/dists/woody-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/woody-proposed-updates_$(SECTION)_source.list";
+   FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa i386 ia64 m68k powerpc sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   ExtraOverride "override.woody.extra.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   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";
    Contents " ";
 };
 
@@ -52,6 +65,8 @@ 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";
 };
 
 tree "dists/unstable/main"
@@ -76,12 +91,12 @@ tree "project/experimental"
    Contents " ";
 };
 
-bindirectory "dists/proposed-updates"
+bindirectory "dists/old-proposed-updates"
 {
 
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_-_all.list";
-   Packages "dists/proposed-updates/Packages";
-   Sources "dists/proposed-updates/Sources";
+   FileList "/org/ftp.debian.org/database/dists/old-proposed-updates_-_all.list";
+   Packages "dists/old-proposed-updates/Packages";
+   Sources "dists/old-proposed-updates/Sources";
    Contents " ";
 
    BinOverride "override.potato.all3";