2005-01-14 Anthony Towns <ajt@debian.org> * kelly: when UNACCEPTing, don't double...

[dak.git] / apt.conf

diff --git a/apt.conf b/apt.conf
index 859ea6cb52207857a683e8550fd8cfec9971b2e4..0f8d5c322433b976a6d6ac6e38f83c27a61d6d21 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -69,17 +69,46 @@ tree "dists/unstable"
    Sources::Compress "gzip bzip2";
 };
 
+// debian-installer
+
+tree "dists/testing/main"
+{
+   FileList "/org/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
+   BinOverride "override.sarge.main.$(SECTION)";
+   SrcOverride "override.sarge.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents " ";
+};
+
+tree "dists/testing-proposed-updates/main"
+{
+   FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
+   BinOverride "override.sarge.main.$(SECTION)";
+   SrcOverride "override.sarge.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents " ";
+};
+
 tree "dists/unstable/main"
 {
    FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc";
    BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";
 };
 
+// Experimental
+
 tree "project/experimental"
 {
    FileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
@@ -90,17 +119,3 @@ tree "project/experimental"
    SrcOverride "override.sid.$(SECTION).src";
    Contents " ";
 };
-
-bindirectory "dists/old-proposed-updates"
-{
-
-   FileList "/org/ftp.debian.org/database/dists/old-proposed-updates_-_all.list";
-   Packages "dists/old-proposed-updates/Packages";
-   Sources "dists/old-proposed-updates/Sources";
-   Contents " ";
-
-   BinOverride "override.potato.all3";
-   BinCacheDB "packages-proposed-updates.db";
-   
-   PathPrefix "";
-};