merge months of changes on ftp-master, see ChangeLog

[dak.git] / katie.conf

diff --git a/katie.conf b/katie.conf
index d7b4c5f1484720b78472a7ec2206024991a0bc47..40e0597f05b93395e62f6466e3fccf352a027ef4 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -4,7 +4,7 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "1DB114E0";
+   SigningKeyIds "4F368D5D";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -13,7 +13,7 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/ftp.debian.org/katie/lock";
+   LockFile "/org/ftp.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -34,6 +34,15 @@ Dinstall
    };
 };
 
+Tiffani
+{
+   Options
+   {
+     TempDir "/org/ftp.debian.org/tiffani";
+     MaxDiffs { Default 90; };
+   };
+};
+
 Alicia
 {
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
@@ -101,7 +110,7 @@ Neve
 Lauren
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r6/";
 };
 
 Emilie
@@ -125,10 +134,36 @@ Rhona
   MorgueSubDir "rhona";
 };
 
-Suite
+Lisa
 {
+  AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
+};
 
-  Stable
+Cindy
+{
+  OverrideSuites
+  {
+    Stable
+    {
+      Process "0";
+    };
+
+    Testing
+    {
+      Process "1";
+      OriginSuite "Unstable";
+    };
+
+    Unstable
+    {
+      Process "1";
+    };
+  };
+};
+
+Suite
+{
+  Oldstable
   {
        Components
        {
@@ -153,14 +188,52 @@ Suite
          sparc;
        };
        Announce "debian-changes@lists.debian.org";
-       Version "3.0r4";
+       Version "3.0r6";
        Origin "Debian";
-       Description "Debian 3.0r4 Released 31st December 2004";
+       Description "Debian 3.0r6 Released 31 May 2005";
        CodeName "woody";
        OverrideCodeName "woody";
+       Priority "1";
+       Untouchable "1";
+  };
+
+  Stable
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Architectures
+       {
+         source;
+         all;
+         alpha;
+         arm;
+         hppa;
+         i386;
+         ia64;
+         m68k;
+         mips;
+         mipsel;
+         powerpc;
+         s390;
+         sparc;
+       };
+       Announce "debian-changes@lists.debian.org";
+       Version "3.1r0";
+       Origin "Debian";
+       Description "Debian 3.1r0 Released 06 June 2005";
+       CodeName "sarge";
+       OverrideCodeName "sarge";
        Priority "3";
        Untouchable "1";
        ChangeLogBase "dists/stable/";
+       UdebComponents
+       {
+         main;
+       };
   };
 
   Proposed-Updates
@@ -190,11 +263,11 @@ Suite
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
-       Version "3.0-updates";
+       Version "3.1-updates";
        Origin "Debian";
-       Description "Debian 3.0 Proposed Updates - Not Released";
+       Description "Debian 3.1 Proposed Updates - Not Released";
        CodeName "proposed-updates";
-       OverrideCodeName "woody";
+       OverrideCodeName "sarge";
        OverrideSuite "stable";
        Priority "4";
        VersionChecks
@@ -214,6 +287,10 @@ Suite
            Stable;
          };
        };
+       UdebComponents
+       {
+         main;
+       };
   };
 
   Testing
@@ -243,8 +320,8 @@ Suite
        Announce "debian-testing-changes@lists.debian.org";
        Origin "Debian";
        Description "Debian Testing distribution - Not Released";
-       CodeName "sarge";
-       OverrideCodeName "sarge";
+       CodeName "etch";
+       OverrideCodeName "etch";
        Priority "5";
        UdebComponents
        {
@@ -280,8 +357,8 @@ Suite
        Origin "Debian";
        Description "Debian Testing distribution updates - Not Released";
        CodeName "testing-proposed-updates";
-       OverrideCodeName "sarge";
-       OverrideSuite "unstable";
+       OverrideCodeName "etch";
+       OverrideSuite "etch";
        Priority "6";
        VersionChecks
        {
@@ -428,6 +505,7 @@ Dir
   PoolRoot "pool/";
   Lists "/org/ftp.debian.org/database/dists/";
   Log "/org/ftp.debian.org/log/";
+  Lock "/org/ftp.debian.org/lock";
   Morgue "/org/ftp.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/ftp.debian.org/scripts/override/";