X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=04383af3b76234931d5710fc77fd71d0170d20f1;hb=98cd3d01bddf470863532e56c4aa9b58a49e820f;hp=73e4452421d5016097ac1a27db725d834530b806;hpb=3c7d9c5b21e0418924ed493911e0679ae89f2acb;p=dak.git

diff --git a/katie.conf b/katie.conf
index 73e44524..04383af3 100644
--- a/katie.conf
+++ b/katie.conf
@@ -26,7 +26,8 @@ Dinstall
    PackagesServer "packages.debian.org";
    NewAckList "/org/ftp.debian.org/katie/log";
    LockFile "/org/ftp.debian.org/katie/lock";
-   Bcc "troup@auric.debian.org";
+   Bcc "archive@ftp-master.debian.org";
+   GroupOverrideFilename "override.group-maint";
 
 };
 
@@ -94,8 +95,10 @@ Madison
 
   Options
   {
+    Architecture "";
     Debug "";
     Help "";
+    Maintainer "";
     Suite "";
     Version "";
    };
@@ -183,7 +186,7 @@ Rhona
    };
 
   // How long (in seconds) dead packages are left before being killed
-  StayOfExecution 172800; // 2 days
+  StayOfExecution 129600; // 1.5 days
   MorgueSubDir "rhona";
   OverrideFilename "override.source-only";
 };
@@ -223,6 +226,7 @@ Suite
 	Origin "Debian";
 	Description "Experimental packages - not released; use at your own risk.";
 	CodeName "experimental";
+	NotAutomatic "yes";
 	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	Priority "0";
@@ -297,7 +301,9 @@ Suite
 	  "all" "";
 	  "alpha" ""; 
 	  "arm" "";
+	  "hppa" "";
 	  "i386" "";
+	  "ia64" "";
 	  "m68k" "";
 	  "powerpc" "";
 	  "sparc" "";
@@ -309,6 +315,34 @@ Suite
 	Priority "3";
   };
 
+  Woody-Proposed-Updates
+  {
+	Components 
+	{
+	  main "";
+	  contrib "";
+	  non-free "";
+	};
+	Architectures 
+	{
+	  "source" "";  
+	  "all" "";
+	  "alpha" ""; 
+	  "arm" "";
+	  "hppa" "";
+	  "i386" "";
+	  "ia64" "";
+	  "m68k" "";
+	  "powerpc" "";
+	  "sparc" "";
+	};
+	Origin "Debian";
+	Description "Debian Testing distribution updates - Not Released";
+	CodeName "woody-proposed-updates";
+	OverrideCodeName "woody";
+	Priority "4";
+  };
+
   Unstable
   {
 	Components 
@@ -340,7 +374,7 @@ Suite
 	Description "Debian Unstable - Not Released";
 	CodeName "sid";
 	OverrideCodeName "sid";
-	Priority "4";
+	Priority "5";
   };
 
 };
@@ -355,6 +389,7 @@ Dir
   IncomingDir "/org/ftp.debian.org/incoming/";
   OverrideDir "/org/ftp.debian.org/scripts/override/";
   ListsDir "/org/ftp.debian.org/database/dists/";
+  LogDir "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
 };
 
@@ -363,7 +398,6 @@ DB
   Name "projectb";
   Host ""; 
   Port -1;
-  ROUser "nobody";
 };
 
 Architectures