t-p-u udeb support. remove obsolete and very bad t-s -> s mapping.

diff --git a/apt.conf b/apt.conf
index f7422d595848cebef93dbf51d3b74b918a55cc37..0f8d5c322433b976a6d6ac6e38f83c27a61d6d21 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -75,7 +75,19 @@ 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 source";
+   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";

diff --git a/katie.conf b/katie.conf
index 29076232df06227a6efae2c31913cfb3e0cbe5a4..f49dd574ec87cb0c286c2b50e96d796c0dc6ad29 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -276,6 +276,10 @@ Suite
            Experimental;
          };
        };
+       UdebComponents
+       {
+         main;
+       };
   };
 
   Unstable
@@ -379,14 +383,12 @@ Suite
 
 SuiteMappings
 {
- "map testing-security proposed-updates";
-
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";
- //"map testing-security testing-proposed-updates";
+ "map testing-security testing-proposed-updates";
  "map-unreleased testing unstable";
  "map-unreleased testing-proposed-updates unstable";
 };