X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf;fp=apt.conf;h=6181945471bcdb646e91521434f9db06c7d938ad;hb=b981d2124dad87cd181b5218cc0cf7764298b896;hp=17cc9010c0af7f4eab2730a95322198170443128;hpb=3c6cf6cead6c23a1b403f2fd18c033a32efbaabc;p=dak.git

diff --git a/apt.conf b/apt.conf
index 17cc9010..61819454 100644
--- a/apt.conf
+++ b/apt.conf
@@ -20,26 +20,38 @@ 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 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";
+   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.woody.$(SECTION)";
-   ExtraOverride "override.woody.extra.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   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 " ";
 };
 
@@ -76,12 +88,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";