X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=29076232df06227a6efae2c31913cfb3e0cbe5a4;hb=aacb40191ca186ea8c9f44e5ba3b1b468b526484;hp=541aa22b3a28e82f1c29e4b975fb1f4bd32299f0;hpb=4cb4df2ea33374acb5f6f04eaddea06977dfb620;p=dak.git

diff --git a/katie.conf b/katie.conf
index 541aa22b..29076232 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";
@@ -27,6 +27,15 @@ Dinstall
    {
      unstable;
    };
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Alicia
+{
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
 Julia
@@ -77,7 +86,7 @@ Neve
 Lauren
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.0r1/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r2/";
 };
 
 Emilie
@@ -104,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
   {
@@ -200,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";
@@ -248,8 +187,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	  };
 	  MustBeOlderThan
@@ -289,6 +226,10 @@ Suite
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "5";
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Testing-Proposed-Updates
@@ -424,8 +365,6 @@ Suite
 	{
 	  MustBeNewerThan
 	  {
-	    OldStable;
-	    Old-Proposed-Updates;
 	    Stable;
 	    Proposed-Updates;
 	    Testing;
@@ -440,11 +379,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";