sync

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

diff --git a/katie.conf-non-US b/katie.conf-non-US
index c2172f942fbfbbbd36a795b7333e113318c3b229..f50bb6eef97355e2ac9b188cee56df4e48fc20ea 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -9,7 +9,6 @@ Dinstall
         Manual-Reject "";
         No-Action "";
         No-Lock "";
-        No-Version-Check "";
         No-Mail "";
         Override-Distribution "";
         Version "";
@@ -19,9 +18,13 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
+   MyDistribution "Debian"; // Used in emails
+   BugServer "bugs.debian.org";
    NewAckList "/org/non-us.debian.org/katie/log";
    LockFile "/org/non-us.debian.org/katie/lock";
+   Bcc "troup@auric.debian.org";
 
 };
 
@@ -41,6 +44,20 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Version "";
+   };
+
+};
+
 Tea
 {
 
@@ -95,7 +112,7 @@ Natalie
     Debug "";
     Help "";
     Version "";
-    Component "main";
+    Component "non-US/main";
     List "";
     Suite "unstable";
     Set "";
@@ -156,29 +173,30 @@ Suite
 {
 
   // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins)
-  
-  Experimental
-  {
-       Architectures 
-       {
-         "source" "";  
-         "all" "";
-         "alpha" ""; 
-         "arm" "";
-         "i386" "";
-         "m68k" "";
-         "powerpc" "";
-         "sparc" "";
-       };
-       Announce "debian-devel-changes@lists.debian.org";
-       Version "xx";
-       Origin "Debian";
-       Description "Experimental packages - not released; use at your own risk.";
-       CodeName "experimental";
-       OverrideCodeName "experimental";
-       SingleOverrideFile "true";
-       Priority "0";
-  };
+
+  // non-US doesn't have experimental (yet)  
+//    Experimental
+//    {
+//     Architectures 
+//     {
+//       "source" "";  
+//       "all" "";
+//       "alpha" ""; 
+//       "arm" "";
+//       "i386" "";
+//       "m68k" "";
+//       "powerpc" "";
+//       "sparc" "";
+//     };
+//     Announce "debian-devel-changes@lists.debian.org";
+//     Origin "Debian";
+//     Description "Experimental packages - not released; use at your own risk.";
+//     CodeName "experimental";
+//     OverrideCodeName "experimental";
+//     SingleOverrideFile "true";
+//     Priority "0";
+//          Tree "project/experimental";
+//    };
 
   Stable
   {
@@ -230,6 +248,7 @@ Suite
        Description "Proposed Updates for Debian 2.2r3 - Not Released";
        CodeName "proposed-updates";
        OverrideCodeName "potato";
+       OverrideSuite "stable";
        Priority "2";
   };
 
@@ -252,9 +271,9 @@ Suite
          "powerpc" "";
          "sparc" "";
        };
-       Version "2.3-testing";
        Origin "Debian";
-       Description "Debian 2.3 Testing distribution - Not Released";
+       Description "Debian Testing distribution - Not Released";
+       CodeName "woody";
        OverrideCodeName "woody";
        Priority "3";
   };
@@ -276,17 +295,18 @@ Suite
          "hppa" "";
          "hurd-i386" "";
          "i386" "";
+         "ia64" "";
          "m68k" "";
          "mips" "";
          "mipsel" "";
          "powerpc" "";
+         "s390" "";
          "sh" "";
          "sparc" "";
        };
        Announce "debian-devel-changes@lists.debian.org";
-       Version "2.3";
        Origin "Debian";
-       Description "Debian 2.3 Unstable - Not Released";
+       Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
        Priority "4";
@@ -307,7 +327,8 @@ Dir
 
 DB
 {
-  Host "non-us.debian.org";
+  Name "projectb";
+  Host "";
   Port -1;
   ROUser "nobody";
 };
@@ -322,10 +343,12 @@ Architectures
   hppa "HP PA RISC";
   arm "Arm";
   i386 "Intel ia32";
+  ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
   mips "SGI MIPS";
   mipsel "SGI MIPS (Little Endian)";
   powerpc "PowerPC";
+  s390 "IBM S/390";
   sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";
 
@@ -337,6 +360,7 @@ Archive
   non-US 
   {
     OriginServer "non-us.debian.org";
+    PrimaryMirror "non-us.debian.org";
     Description "Non-US Archive for the Debian project";
   };