X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=4ea1ce6e1dbf7af111463763a410038579acb0dc;hb=faf42c1d777c994b83c27152e1d18c38ce7aa4f0;hp=c2172f942fbfbbbd36a795b7333e113318c3b229;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index c2172f94..4ea1ce6e 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 "";
@@ -41,6 +40,20 @@ Heidi
 
 };
 
+Catherine
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Limit "";
+    No-Action "";
+    Version "";
+   };
+
+};
+
 Tea
 {
 
@@ -95,7 +108,7 @@ Natalie
     Debug "";
     Help "";
     Version "";
-    Component "main";
+    Component "non-US/main";
     List "";
     Suite "unstable";
     Set "";
@@ -156,29 +169,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 +244,7 @@ Suite
 	Description "Proposed Updates for Debian 2.2r3 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
+	OverrideSuite "stable";
 	Priority "2";
   };
 
@@ -252,9 +267,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";
   };
@@ -276,17 +291,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";
@@ -322,10 +338,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";