X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf-non-US;h=59bf4014bbb9c34ed8a0eab08862a57d1aa90156;hb=6a7276c46e55e511372ea4cd79cf4e466d1d6fd7;hp=ca4bfd9e60a0d3c2c5135b128259542e4e73f1e5;hpb=9ebfa30b056df56376cb0302a28a190e0aaed765;p=dak.git

diff --git a/apt.conf-non-US b/apt.conf-non-US
index ca4bfd9e..59bf4014 100644
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -17,18 +17,28 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/non-us.debian.org/scripts/masterfiles/Contents.top";
+   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 mips mipsel powerpc s390 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 mips mipsel powerpc s390 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";