X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=0a1d2836f14ed5bbed5b01bb0338dca88bc6de57;hb=ccc8127b612d886ccfdc26366313f985393c18af;hp=6af40418b9de3cf819c89d21e512bad9ac96677a;hpb=a8487737ac65dea99f901259c0c6169a086a9389;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 6af40418..0a1d2836 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -9,7 +9,6 @@ Dinstall
         Manual-Reject "";
         No-Action "";
         No-Lock "";
-        No-Version-Check "";
         No-Mail "";
         Override-Distribution "";
         Version "";
@@ -19,9 +18,14 @@ Dinstall
    GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
    SendmailCommand "/usr/sbin/sendmail -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
+   MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()
+   MyDistribution "Debian"; // Used in emails
+   BugServer "bugs.debian.org";
+   PackagesServer "packages.debian.org";
    NewAckList "/org/non-us.debian.org/katie/log";
    LockFile "/org/non-us.debian.org/katie/lock";
+   Bcc "troup@auric.debian.org";
 
 };
 
@@ -41,6 +45,20 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Version "";
+   };
+
+};
+
 Tea
 {
 
@@ -95,7 +113,7 @@ Natalie
     Debug "";
     Help "";
     Version "";
-    Component "main";
+    Component "non-US/main";
     List "";
     Suite "unstable";
     Set "";
@@ -156,29 +174,30 @@ Suite
 {
 
   // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins)
-  
-  Experimental
-  {
-	Architectures 
-	{
-	  "source" "";  
-	  "all" "";
-	  "alpha" ""; 
-	  "arm" "";
-	  "i386" "";
-	  "m68k" "";
-	  "powerpc" "";
-	  "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";
-	Priority "0";
-  };
+
+  // non-US doesn't have experimental (yet)  
+//    Experimental
+//    {
+//  	Architectures 
+//  	{
+//  	  "source" "";  
+//  	  "all" "";
+//  	  "alpha" ""; 
+//  	  "arm" "";
+//  	  "i386" "";
+//  	  "m68k" "";
+//  	  "powerpc" "";
+//  	  "sparc" "";
+//  	};
+//  	Announce "debian-devel-changes@lists.debian.org";
+//  	Origin "Debian";
+//  	Description "Experimental packages - not released; use at your own risk.";
+//  	CodeName "experimental";
+//  	OverrideCodeName "experimental";
+//  	SingleOverrideFile "true";
+//  	Priority "0";
+//          Tree "project/experimental";
+//    };
 
   Stable
   {
@@ -230,6 +249,7 @@ Suite
 	Description "Proposed Updates for Debian 2.2r3 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
+	OverrideSuite "stable";
 	Priority "2";
   };
 
@@ -252,9 +272,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";
   };
@@ -286,9 +306,8 @@ Suite
 	  "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";
@@ -309,7 +328,8 @@ Dir
 
 DB
 {
-  Host "non-us.debian.org";
+  Name "projectb";
+  Host "";
   Port -1;
   ROUser "nobody";
 };
@@ -341,6 +361,7 @@ Archive
   non-US 
   {
     OriginServer "non-us.debian.org";
+    PrimaryMirror "non-us.debian.org";
     Description "Non-US Archive for the Debian project";
   };