2004-02-27 Martin Michlmayr <tbm@cyrius.com> * docs/README.config: lots of updates...

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

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 8ad8cecce5de252f03eeaa0c3eec5a0b3a26284b..24bfd1c60412cdefe070cbda2436424c37e5fac2 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "722F1AED";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -13,25 +13,33 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   NewAckList "/org/non-us.debian.org/katie/log";
    LockFile "/org/non-us.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   FutureTimeTravelGrace 28800; // 6 hours
+   FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
    CloseBugs "true";
    SuiteSuffix "non-US";
    OverrideDisparityCheck "true";
-   StableDislocationSupport "true";
+   StableDislocationSupport "false";
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r2/";
 };
 
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,www-data,katie,auric";
+  // Comma separated list of users who are in Postgres but not the passwd file
+  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
 };
 
 Shania
@@ -89,6 +97,7 @@ Rhona
 
 Suite
 {
+
   Stable
   {
        Components 
@@ -103,45 +112,61 @@ Suite
          all;
          alpha; 
          arm;
+         hppa;
          i386;
+         ia64;
          m68k;
+         mips;
+         mipsel;
          powerpc;
+         s390;
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "2.2r7";
+       Version "3.0r2";
        Origin "Debian";
-       Description "Debian 2.2r7 Released 12th July 2002";
-       CodeName "potato";
-       OverrideCodeName "potato";
-       Priority "1";
+       Description "Debian 3.0r2 Released 20th November 2003";
+       CodeName "woody";
+       OverrideCodeName "woody";
+       Priority "3";
        Untouchable "1";
        ChangeLogBase "dists/stable/non-US/";
   };
 
   Proposed-Updates
   {
+       Components 
+       {
+         non-US/main;
+         non-US/contrib;
+         non-US/non-free;
+       };
        Architectures 
        {
          source;  
          all;
          alpha; 
          arm;
+         hppa;
          i386;
+         ia64;
          m68k;
+         mips;
+         mipsel;
          powerpc;
+         s390;
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
-       Version "2.2r7";
+       Version "3.0-updates";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r7 - Not Released";
+       Description "Debian 3.0 Proposed Updates - Not Released";
        CodeName "proposed-updates";
-       OverrideCodeName "potato";
+       OverrideCodeName "woody";
        OverrideSuite "stable";
-       Priority "2";
+       Priority "4";
        VersionChecks
        {
          MustBeNewerThan
@@ -182,12 +207,12 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "woody";
-       OverrideCodeName "woody";
-       Priority "3";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
+       Priority "5";
   };
 
-  Woody-Proposed-Updates
+  Testing-Proposed-Updates
   {
        Components 
        {
@@ -213,10 +238,10 @@ Suite
        };
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
-       CodeName "woody-proposed-updates";
-       OverrideCodeName "woody";
+       CodeName "testing-proposed-updates";
+       OverrideCodeName "sarge";
        OverrideSuite "unstable";
-       Priority "4";
+       Priority "6";
        VersionChecks
        {
          MustBeNewerThan
@@ -264,7 +289,7 @@ Suite
        Description "Debian Unstable - Not Released";
        CodeName "sid";
        OverrideCodeName "sid";
-       Priority "5";
+       Priority "7";
        VersionChecks
        {
          MustBeNewerThan
@@ -272,7 +297,7 @@ Suite
            Stable;
            Proposed-Updates;
            Testing;
-           Woody-Proposed-Updates;
+           Testing-Proposed-Updates;
          };
        };
   };
@@ -281,14 +306,17 @@ Suite
 
 SuiteMappings
 {
+ // JT - temp measure
+ "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 woody-proposed-updates";
- "map testing-security woody-proposed-updates";
- "map-unreleased testing unstable-";
- "map-unreleased woody-proposed-updates unstable";
+ "map testing testing-proposed-updates";
+ //"map testing-security testing-proposed-updates";
+ "map-unreleased testing unstable";
+ "map-unreleased testing-proposed-updates unstable";
 };
 
 Dir
@@ -305,7 +333,6 @@ Dir
   UrgencyLog "/org/non-us.debian.org/testing/";
   Queue
   {
-    Root "/org/non-us.debian.org/queue/";
     Accepted "/org/non-us.debian.org/queue/accepted/";
     Byhand "/org/non-us.debian.org/queue/byhand/";
     Done "/org/non-us.debian.org/queue/done/";
@@ -331,12 +358,12 @@ Architectures
   alpha "DEC Alpha";
   hurd-i386 "Intel ia32 running the HURD";
   hppa "HP PA RISC";
-  arm "Arm";
+  arm "ARM";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
-  mips "SGI MIPS";
-  mipsel "SGI MIPS (Little Endian)";
+  mips "MIPS (Big Endian)";
+  mipsel "MIPS (Little Endian)";
   powerpc "PowerPC";
   s390 "IBM S/390";
   sh "Hitatchi SuperH";
@@ -409,31 +436,30 @@ OverrideType
 
 Location
 {
-  
-  // Old style locations on non-US.debian.org
+  /org/non-us.debian.org/ftp/dists/
+    {
+      Archive "non-US";
+      Type "legacy";
+    };
 
-  /org/non-us.debian.org/ftp/dists/proposed-updates/
+  /org/non-us.debian.org/ftp/dists/old-proposed-updates/
     {
       Archive "non-US";
-      Suite "proposed-updates";
       Type "legacy-mixed";
     };
 
-  /org/non-us.debian.org/ftp/dists/
+  /org/non-us.debian.org/ftp/pool/
     {
       Archive "non-US";
       Suites 
        {
+         OldStable;
          Stable;
+         Proposed-Updates;
+         Testing;
+         Testing-Proposed-Updates;
          Unstable;
         };
-      Type "legacy";
-    };
-
-  // New pool locations on non-US.debian.org
-  /org/non-us.debian.org/ftp/pool/
-    {
-      Archive "non-US";
       Type "pool";
     };
 
@@ -451,4 +477,3 @@ Urgency
     critical;
   };
 };
-