X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf-non-US;h=727dc1c9543b1c784f7f635dae77f647e53dc80d;hb=d18cb779351f1803efc61e27f248b6f33d95756e;hp=5f039f4619f494f2bcfb158dd0c70e068e04d441;hpb=30b3579ed7ed23f0c8d7b48ec98fec5a6dd062a7;p=dak.git

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 5f039f46..727dc1c9 100644
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -20,47 +20,44 @@ TreeDefault
    Contents::Header "/org/non-us.debian.org/katie/Contents.top";
 };
 
-tree "dists/testing/non-US"
+tree "dists/proposed-updates/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";
+   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 powerpc sparc source";
+   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/woody-proposed-updates/non-US"
+tree "dists/testing/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_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 powerpc sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
+   BinOverride "override.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
+};
+
+tree "dists/testing-proposed-updates/non-US"
+{
+   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.sarge.$(SECTION)";
+   SrcOverride "override.sarge.$(SECTION).src";
    Contents " ";
 };
 
 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";
+   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 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_-_all.list";
-   Packages "dists/proposed-updates/Packages";
-   Sources "dists/proposed-updates/Sources";
-   Contents " ";
-
-   BinOverride "override.potato.all3";
-   BinCacheDB "packages-proposed-updates.db";
-   
-   PathPrefix "";
-};