X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf;h=6141a0deb2372e8a9106c2cfa19086c14f96a070;hb=3f9ff6d276ec8dc5fe312a78f3284221979cece9;hp=2c9480941e16c2d59db2539545a985d53df8a7c3;hpb=b299217795cd391635b55092597bbe8ea65e24fe;p=dak.git

diff --git a/apt.conf b/apt.conf
index 2c948094..6141a0de 100644
--- a/apt.conf
+++ b/apt.conf
@@ -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/woody-proposed-updates"
+tree "dists/testing"
 {
-   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";
+   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 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";
+};
+
+tree "dists/testing-proposed-updates"
+{
+   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 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"
@@ -75,17 +90,3 @@ tree "project/experimental"
    SrcOverride "override.sid.$(SECTION).src";
    Contents " ";
 };
-
-bindirectory "dists/proposed-updates"
-{
-
-   FileList "/org/ftp.debian.org/database/dists/proposed-updates_-_all.list";
-   Packages "dists/proposed-updates/Packages";
-   Sources "dists/proposed-updates/Sources";
-   Contents " ";
-
-   BinOverride "override.potato.all3";
-   BinCacheDB "packages-proposed-updates.db";
-   
-   PathPrefix "";
-};