X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=c5de02346ecbdc3cf0fe58bb2b41bb672e3b0737;hb=c598a0fb398b1ac1a8a7c65a73290998276cd765;hp=d3c169f44518c523e68d4d60f94485e2c8afa835;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git

diff --git a/katie.conf b/katie.conf
index d3c169f4..c5de0234 100644
--- a/katie.conf
+++ b/katie.conf
@@ -9,7 +9,6 @@ Dinstall
         Manual-Reject "";
         No-Action "";
         No-Lock "";
-        No-Version-Check "";
         No-Mail "";
         Override-Distribution "";
         Version "";
@@ -17,6 +16,7 @@ Dinstall
 
    PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
@@ -41,6 +41,21 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Verbose "";
+    Version "";
+   };
+
+};
+
 Tea
 {
 
@@ -159,25 +174,38 @@ Suite
   
   Experimental
   {
+	Components 
+	{
+	  main "";
+	  contrib "";
+	  non-free "";
+	};
 	Architectures 
 	{
-	  "source" "";  
+	  "source" ""; 
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
+	  "hurd-i386" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
+	  "mips" "";
+	  "mipsel" "";
 	  "powerpc" "";
+	  "s390" "";
+	  "sh" "";
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "xx";
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
-	OverrideCodeName "experimental";
-	SingleOverrideFile "true";
+	OverrideCodeName "sid";
+	OverrideSuite "unstable";
 	Priority "0";
+        Tree "project/experimental";
   };
 
   Stable
@@ -253,9 +281,9 @@ Suite
 	  "powerpc" "";
 	  "sparc" "";
 	};
-	Version "2.3-testing";
 	Origin "Debian";
-	Description "Debian 2.3 Testing distribution - Not Released";
+	Description "Debian Testing distribution - Not Released";
+	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
   };
@@ -277,17 +305,18 @@ Suite
 	  "hppa" "";
 	  "hurd-i386" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "mips" "";
 	  "mipsel" "";
 	  "powerpc" "";
+	  "s390" "";
 	  "sh" "";
 	  "sparc" "";
 	};
 	Announce "debian-devel-changes@lists.debian.org";
-	Version "2.3";
 	Origin "Debian";
-	Description "Debian 2.3 Unstable - Not Released";
+	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
 	Priority "4";
@@ -323,10 +352,12 @@ Architectures
   hppa "HP PA RISC";
   arm "Arm";
   i386 "Intel ia32";
+  ia64 "Intel ia64";
   m68k "Motorola Mc680x0";
   mips "SGI MIPS";
   mipsel "SGI MIPS (Little Endian)";
   powerpc "PowerPC";
+  s390 "IBM S/390";
   sh "Hitatchi SuperH";
   sparc "Sun SPARC/UltraSPARC";