X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=1098c73853d2a2150a68251cef3f42e95dd3de25;hb=f1c6b12f17fd63c6b6e644deff776dc378fdadad;hp=ee0dbfa37c3fad85183357c24fcbe04a7710a30d;hpb=f2d23dda99adb819046789953201f5eb7f95186d;p=dak.git

diff --git a/katie.conf b/katie.conf
index ee0dbfa3..1098c738 100644
--- 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 "38C6029A";
+   SigningKeyIds "1DB114E0";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -16,8 +16,7 @@ Dinstall
    LockFile "/org/ftp.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;
    BXANotify "true";
@@ -28,12 +27,21 @@ Dinstall
    {
      unstable;
    };
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Alicia
+{
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
+  // Comma separated list of users who are in Postgres but not the passwd file
   KnownPostgres "postgres,katie";
 };
 
@@ -75,6 +83,12 @@ Neve
   ExportDir "/org/ftp.debian.org/katie/neve-files/";
 };
 
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r2/";
+};
+
 Emilie
 {
   LDAPDn "ou=users,dc=debian,dc=org";
@@ -99,76 +113,6 @@ Rhona
 
 Suite
 {
-  OldStable
-  {
-	Components
-	{
-	  main;
-	  contrib;
-	  non-free;
-	};
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  i386;
-	  m68k;
-	  powerpc;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	Version "2.2r7";
-	Origin "Debian";
-	Description "Debian 2.2r7 Released 12th July 2002";
-	CodeName "potato";
-	OverrideCodeName "potato";
-	Priority "1";
-	Untouchable "1";
-	ChangeLogBase "dists/oldstable/";
-  };
-
-  Old-Proposed-Updates
-  {
-	Architectures
-	{
-	  source;
-	  all;
-	  alpha;
-	  arm;
-	  i386;
-	  m68k;
-	  powerpc;
-	  sparc;
-	};
-	Announce "debian-changes@lists.debian.org";
-	CopyChanges "dists/old-proposed-updates/";
-	CopyKatie "/org/ftp.debian.org/queue/old-proposed-updates/";
-	Version "2.2r7";
-	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r7 - Not Released";
-	CodeName "old-proposed-updates";
-	OverrideCodeName "potato";
-	OverrideSuite "oldstable";
-	Priority "2";
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	  };
-	  MustBeOlderThan
-	  {
-	    Stable;
-	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	    Unstable;
-	    Experimental;
-	  };
-	};
-  };
 
   Stable
   {
@@ -195,9 +139,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.0r1a";
+	Version "3.0r2";
 	Origin "Debian";
-	Description "Debian 3.0r1a Released 16th December 2002";
+	Description "Debian 3.0r2 Released 20th November 2003";
 	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
@@ -243,8 +187,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	  };
 	  MustBeOlderThan
@@ -284,6 +226,10 @@ Suite
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "5";
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Testing-Proposed-Updates
@@ -330,6 +276,10 @@ Suite
 	    Experimental;
 	  };
 	};
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Unstable
@@ -419,8 +369,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	    Proposed-Updates;
 	    Testing;
@@ -435,19 +383,12 @@ Suite
 
 SuiteMappings
 {
- "map oldstable old-proposed-updates";
- "map oldstable-security old-proposed-updates";
- "map-unreleased oldstable stable";
- "map-unreleased old-proposed-updates stable";
-
- "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";
 };
@@ -468,7 +409,6 @@ Dir
   UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
   Queue
   {
-    Root "/org/ftp.debian.org/queue/";
     Accepted "/org/ftp.debian.org/queue/accepted/";
     Byhand "/org/ftp.debian.org/queue/byhand/";
     Done "/org/ftp.debian.org/queue/done/";
@@ -557,11 +497,15 @@ Section
   devel;
   doc;
   editors;
+  embedded;
   electronics;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -570,6 +514,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;