X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf-non-US;h=4dff271dee265796f760fc7b99b30636d270a38a;hb=e4f2f33a24646716adedd63afa87a672cd6ed599;hp=4f08607d87887612e9cf567edcffc0800f3a2e7e;hpb=4df20c3923c3b768e31030a436b77829f56776ac;p=dak.git

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 4f08607d..4dff271d 100644
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -20,18 +20,7 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
-tree "dists/stable/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";
-   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;
-};
-
-tree "dists/testing"
+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";
@@ -46,16 +35,15 @@ 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 " ";