X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=d7b4c5f1484720b78472a7ec2206024991a0bc47;hb=7de8df23c5dfc16a9caf283c4d42489a68c00634;hp=ced20342069d30e554c0416e6c188830b0514f3d;hpb=5ab6d288aa431940bdc964919750232ab1b294b4;p=dak.git

diff --git a/katie.conf b/katie.conf
index ced20342..d7b4c5f1 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,17 +16,41 @@ Dinstall
    LockFile "/org/ftp.debian.org/katie/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
-   FutureTimeTravelGrace 28800; // 6 hours
+   FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 300;
    BXANotify "true";
    CloseBugs "true";
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
+   DefaultSuite "unstable";
    AcceptedAutoBuildSuites
    {
      unstable;
    };
+   Reject
+   {
+     NoSourceOnly "true";
+   };
+};
+
+Alicia
+{
+   MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
+};
+
+Billie
+{
+  FTPPath "/org/ftp.debian.org/ftp";
+  TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs";
+  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
+  CombinationTrees
+  {
+    popular { i386; powerpc; all; source; };
+    source { source; };
+    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; };
+  };
 };
 
 Julia
@@ -77,7 +101,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.0r4/";
 };
 
 Emilie
@@ -99,7 +123,6 @@ Rhona
   StayOfExecution 129600; // 1.5 days
   AcceptedAutoBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "rhona";
-  OverrideFilename "override.source-only";
 };
 
 Suite
@@ -130,9 +153,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.0r1a";
+	Version "3.0r4";
 	Origin "Debian";
-	Description "Debian 3.0r1a Released 16th December 2002";
+	Description "Debian 3.0r4 Released 31st December 2004";
 	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
@@ -182,9 +205,14 @@ Suite
 	  };
 	  MustBeOlderThan
 	  {
+	    Testing;
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Stable;
+	  };
 	};
   };
 
@@ -212,11 +240,16 @@ Suite
 	  s390;
 	  sparc;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
 	CodeName "sarge";
 	OverrideCodeName "sarge";
 	Priority "5";
+	UdebComponents
+	{
+	  main;
+	};
   };
 
   Testing-Proposed-Updates
@@ -243,6 +276,7 @@ Suite
 	  s390;
 	  sparc;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
 	CodeName "testing-proposed-updates";
@@ -262,6 +296,14 @@ Suite
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Testing;
+          };
+	};
+	UdebComponents
+	{
+	  main;
 	};
   };
 
@@ -366,14 +408,14 @@ Suite
 
 SuiteMappings
 {
- "map testing-security proposed-updates";
-
+ "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";
  "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";
 };
@@ -384,7 +426,6 @@ Dir
   Pool "/org/ftp.debian.org/ftp/pool/";
   Templates "/org/ftp.debian.org/katie/templates/";
   PoolRoot "pool/";
-  Override "/org/ftp.debian.org/scripts/override/";
   Lists "/org/ftp.debian.org/database/dists/";
   Log "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
@@ -394,7 +435,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/";
@@ -402,6 +442,7 @@ Dir
     New "/org/ftp.debian.org/queue/new/";
     Reject "/org/ftp.debian.org/queue/reject/";
     Unchecked "/org/ftp.debian.org/queue/unchecked/";
+    BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/";
   };
 };