X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=apt.conf-non-US;h=5f039f4619f494f2bcfb158dd0c70e068e04d441;hb=d904756049f3c53b562cd2c1f96f7e09dba21949;hp=ef7f1190cecddfdf7d385a7f0a32176df9dc2328;hpb=bb8283ad6274e461fc78a00b2a52c6594c53e13d;p=dak.git

diff --git a/apt.conf-non-US b/apt.conf-non-US
index ef7f1190..5f039f46 100644
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -20,15 +20,25 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
-tree "dists/stable/non-US"
+tree "dists/testing/non-US"
 {
-   FileList "/org/non-us.debian.org/database/dists/stable_non-us/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/non-us.debian.org/database/dists/stable_non-us/$(SECTION)_source.list";
+   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 i386 m68k powerpc sparc source";
-   BinOverride "override.potato.$(SECTION)";
-   SrcOverride "override.potato.$(SECTION).src";
-   External-Links false;
+   Architectures "alpha arm hppa i386 ia64 m68k powerpc sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+};
+
+tree "dists/woody-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";
+   Sections "main contrib non-free";
+   Architectures "alpha arm hppa i386 ia64 m68k powerpc sparc source";
+   BinOverride "override.woody.$(SECTION)";
+   SrcOverride "override.woody.$(SECTION).src";
+   Contents " ";
 };
 
 tree "dists/unstable/non-US"
@@ -36,19 +46,18 @@ tree "dists/unstable/non-US"
    FileList "/org/non-us.debian.org/database/dists/unstable_non-us/$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/non-us.debian.org/database/dists/unstable_non-us/$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
+   BinOverride "override.sid.$(SECTION)";
+   SrcOverride "override.sid.$(SECTION).src";
 };
 
 bindirectory "dists/proposed-updates"
 {
 
-   FileList "/org/non-us.debian.org/database/dists/proposed-updates_-_binary.list";
-   SourceFileList "/org/non-us.debian.org/database/proposed-updates_-_source.list";
+   FileList "/org/non-us.debian.org/database/dists/proposed-updates_-_all.list";
    Packages "dists/proposed-updates/Packages";
    Sources "dists/proposed-updates/Sources";
-   Contents "";
+   Contents " ";
 
    BinOverride "override.potato.all3";
    BinCacheDB "packages-proposed-updates.db";