X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=ced20342069d30e554c0416e6c188830b0514f3d;hb=a29673e49824a6c0838df50ab64ac08cf32852d8;hp=d8729026f1b393029a54e4e64171c288f9e6e085;hpb=c7061f3025ae8c7413054cc7eb08839ea29b061a;p=dak.git

diff --git a/katie.conf b/katie.conf
index d8729026..ced20342 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 "722F1AED";
+   SigningKeyIds "38C6029A";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
@@ -16,7 +16,6 @@ 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
    PastCutoffYear "1984";
    SkipTime 300;
@@ -33,7 +32,7 @@ Dinstall
 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 +74,25 @@ Neve
   ExportDir "/org/ftp.debian.org/katie/neve-files/";
 };
 
+Lauren
+{
+   StableRejector "Martin (Joey) Schulze <joey@debian.org>";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r1/";
+};
+
+Emilie
+{
+  LDAPDn "ou=users,dc=debian,dc=org";
+  LDAPServer "db.debian.org";
+  ExtraKeyrings
+  {
+    "/org/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/org/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/org/keyring.debian.org/keyrings/extra-keys.pgp";
+  };
+  KeyServer "wwwkeys.eu.pgp.net";
+};
+
 Rhona
 {
   // How long (in seconds) dead packages are left before being killed
@@ -86,76 +104,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
   {
@@ -182,9 +130,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.0";
+	Version "3.0r1a";
 	Origin "Debian";
-	Description "Debian 3.0 Released 20th July 2002";
+	Description "Debian 3.0r1a Released 16th December 2002";
 	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
@@ -230,8 +178,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	  };
 	  MustBeOlderThan
@@ -406,8 +352,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	    Proposed-Updates;
 	    Testing;
@@ -422,11 +366,6 @@ 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";
@@ -544,11 +483,15 @@ Section
   devel;
   doc;
   editors;
+  embedded;
   electronics;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -557,6 +500,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;