X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf-non-US;h=727dc1c9543b1c784f7f635dae77f647e53dc80d;hb=dd866b48805fee669a51b57dd9434b4251cb81e3;hp=9241ffa36773dbc03e66a38c651197a5dd5f5fb2;hpb=cd4af5e0861a437353d10058c3cb099e3befb369;p=dak.git

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 9241ffa3..727dc1c9 100644
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -20,24 +20,35 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
+tree "dists/proposed-updates/non-US"
+{
+   FileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/proposed-updates_non-US/$(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)";
+   SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
+};
+
 tree "dists/testing/non-US"
 {
    FileList "/org/non-us.debian.org/database/dists/testing_non-US/$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/non-us.debian.org/database/dists/testing_non-US/$(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)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
 };
 
-tree "dists/woody-proposed-updates/non-US"
+tree "dists/testing-proposed-updates/non-US"
 {
-   FileList "/org/non-us.debian.org/database/dists/woody-proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/non-us.debian.org/database/dists/woody-proposed-updates_non-US/$(SECTION)_source.list";
+   FileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/non-us.debian.org/database/dists/testing-proposed-updates_non-US/$(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)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
    Contents " ";
 };
 
@@ -50,17 +61,3 @@ tree "dists/unstable/non-US"
    BinOverride "override.sid.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
 };
-
-bindirectory "dists/proposed-updates"
-{
-
-   FileList "/org/non-us.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 "";
-};