X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=fc6712fb7ae3dba9ad5de6f0b176f9fe118dfb93;hb=dd866b48805fee669a51b57dd9434b4251cb81e3;hp=02b3e45c7b594946d8108ff06e218d53e524e4f5;hpb=d1b80c815c6f838297de84d01fe3675195dc0090;p=dak.git

diff --git a/katie.conf b/katie.conf
index 02b3e45c..fc6712fb 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 "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
@@ -24,7 +24,7 @@ Dinstall
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
    DefaultSuite "unstable";
-   AcceptedAutoBuildSuites
+   QueueBuildSuites
    {
      unstable;
    };
@@ -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.0r3/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r6/";
 };
 
 Emilie
@@ -121,14 +130,40 @@ Rhona
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  AcceptedAutoBuildStayOfExecution 86400; // 24 hours
+  QueueBuildStayOfExecution 86400; // 24 hours
   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.0r3";
+	Version "3.0r6";
 	Origin "Debian";
-	Description "Debian 3.0r3 Released 25th October 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
@@ -205,9 +278,18 @@ Suite
 	  };
 	  MustBeOlderThan
 	  {
+	    Testing;
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Stable;
+	  };
+	};
+	UdebComponents
+	{
+	  main;
 	};
   };
 
@@ -235,10 +317,11 @@ Suite
 	  s390;
 	  sparc;
 	};
+	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
 	{
@@ -270,11 +353,12 @@ Suite
 	  s390;
 	  sparc;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
 	CodeName "testing-proposed-updates";
-	OverrideCodeName "sarge";
-	OverrideSuite "unstable";
+	OverrideCodeName "etch";
+	OverrideSuite "etch";
 	Priority "6";
 	VersionChecks
 	{
@@ -289,6 +373,10 @@ Suite
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Testing;
+          };
 	};
 	UdebComponents
 	{
@@ -397,6 +485,8 @@ Suite
 
 SuiteMappings
 {
+ "propup-version stable-security testing testing-proposed-updates unstable";
+ "propup-version testing-security unstable";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
@@ -415,10 +505,11 @@ 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/";
-  AcceptedAutoBuild "/org/incoming.debian.org/buildd/";
+  QueueBuild "/org/incoming.debian.org/buildd/";
   UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
   Queue
   {