Use parse_args(), use join_with_commas_and(), handle nothing-to-do case better

[dak.git] / apt.conf-non-US

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 5f039f4619f494f2bcfb158dd0c70e068e04d441..9241ffa36773dbc03e66a38c651197a5dd5f5fb2 100644 (file)
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -22,20 +22,20 @@ TreeDefault
 
 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";
+   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";
+   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";
+   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";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source";
    BinOverride "override.woody.$(SECTION)";
    SrcOverride "override.woody.$(SECTION).src";
    Contents " ";
@@ -43,8 +43,8 @@ tree "dists/woody-proposed-updates/non-US"
 
 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)";