X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=709e33b265421afb4852496de1824bc7367ff3dd;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=be37b8344fa79390b9f72120fda9e5abd4e34ca4;hpb=afc35c6746af60493c0d713ff3dc2922ce4447c6;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index be37b834..709e33b2 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -20,10 +20,11 @@ Dinstall
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify "false";
    SkipTime 300;
    CloseBugs "true";
+   SuiteSuffix "non-US";
    OverrideDisparityCheck "true";
+   StableDislocationSupport "true";
 };
 
 Julia
@@ -88,52 +89,24 @@ Rhona
 
 Suite
 {
-
-  // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins)
-
-  // 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";
-//	NotAutomatic "yes";
-//  	Priority "0";
-//          Tree "project/experimental";
-//    };
-
   Stable
   {
 	Components 
 	{
-	  non-US/main "";
-	  non-US/contrib "";
-	  non-US/non-free "";
+	  non-US/main;
+	  non-US/contrib;
+	  non-US/non-free;
 	};
 	Architectures 
 	{
-	  source "";  
-	  all "";
-	  alpha ""; 
-	  arm "";
-	  i386 "";
-	  m68k "";
-	  powerpc "";
-	  sparc "";
+	  source;  
+	  all;
+	  alpha; 
+	  arm;
+	  i386;
+	  m68k;
+	  powerpc;
+	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
 	Version "2.2r6";
@@ -150,14 +123,14 @@ Suite
   {
 	Architectures 
 	{
-	  source "";  
-	  all "";
-	  alpha ""; 
-	  arm "";
-	  i386 "";
-	  m68k "";
-	  powerpc "";
-	  sparc "";
+	  source;  
+	  all;
+	  alpha; 
+	  arm;
+	  i386;
+	  m68k;
+	  powerpc;
+	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
@@ -169,31 +142,43 @@ Suite
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
 	Priority "2";
+	VersionChecks
+	{
+	  MustBeNewerThan
+	  {
+	    Stable;
+	  };
+	  MustBeOlderThan
+	  {
+	    Unstable;
+	    Experimental;
+	  };
+	};
   };
 
   Testing
   {
 	Components 
 	{
-	  non-US/main "";
-	  non-US/contrib "";
-	  non-US/non-free "";
+	  non-US/main;
+	  non-US/contrib;
+	  non-US/non-free;
 	};
 	Architectures 
 	{
-	  source "";  
-	  all "";
-	  alpha ""; 
-	  arm "";
-	  hppa "";
-	  i386 "";
-	  ia64 "";
-	  m68k "";
-	  mips "";
-	  mipsel "";
-	  powerpc "";
-	  s390 "";
-	  sparc "";
+	  source;  
+	  all;
+	  alpha; 
+	  arm;
+	  hppa;
+	  i386;
+	  ia64;
+	  m68k;
+	  mips;
+	  mipsel;
+	  powerpc;
+	  s390;
+	  sparc;
 	};
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
@@ -206,58 +191,73 @@ Suite
   {
 	Components 
 	{
-	  non-US/main "";
-	  non-US/contrib "";
-	  non-US/non-free "";
+	  non-US/main;
+	  non-US/contrib;
+	  non-US/non-free;
 	};
 	Architectures 
 	{
-	  source "";  
-	  all "";
-	  alpha ""; 
-	  arm "";
-	  hppa "";
-	  i386 "";
-	  ia64 "";
-	  m68k "";
-	  mips "";
-	  mipsel "";
-	  powerpc "";
-	  s390 "";
-	  sparc "";
+	  source;  
+	  all;
+	  alpha; 
+	  arm;
+	  hppa;
+	  i386;
+	  ia64;
+	  m68k;
+	  mips;
+	  mipsel;
+	  powerpc;
+	  s390;
+	  sparc;
 	};
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
 	CodeName "woody-proposed-updates";
+	OverrideSuite "unstable";
 	OverrideCodeName "woody";
 	Priority "4";
+	VersionChecks
+	{
+	  MustBeNewerThan
+	  {
+	    Stable;
+	    Proposed-Updates;
+	    Testing;
+	  };
+	  MustBeOlderThan
+	  {
+	    Unstable;
+	    Experimental;
+	  };
+	};
   };
 
   Unstable
   {
 	Components 
 	{
-	  non-US/main "";
-	  non-US/contrib "";
-	  non-US/non-free "";
+	  non-US/main;
+	  non-US/contrib;
+	  non-US/non-free;
 	};
 	Architectures 
 	{
-	  source ""; 
-	  all "";
-	  alpha ""; 
-	  arm "";
-	  hppa "";
-	  hurd-i386 "";
-	  i386 "";
-	  ia64 "";
-	  m68k "";
-	  mips "";
-	  mipsel "";
-	  powerpc "";
-	  s390 "";
-	  sh "";
-	  sparc "";
+	  source; 
+	  all;
+	  alpha; 
+	  arm;
+	  hppa;
+	  hurd-i386;
+	  i386;
+	  ia64;
+	  m68k;
+	  mips;
+	  mipsel;
+	  powerpc;
+	  s390;
+	  sh;
+	  sparc;
 	};
 	Announce "debian-devel-changes@lists.debian.org";
 	Origin "Debian";
@@ -265,16 +265,30 @@ Suite
 	CodeName "sid";
 	OverrideCodeName "sid";
 	Priority "5";
+	VersionChecks
+	{
+	  MustBeNewerThan
+	  {
+	    Stable;
+	    Proposed-Updates;
+	    Testing;
+	    Woody-Proposed-Updates;
+	  };
+	};
   };
 
 };
 
 SuiteMappings
 {
- "map stable proposed-updates"
- "map-unreleased stable unstable"
- "map-unreleased proposed-updates unstable"
- "ignore testing"
+ "map stable proposed-updates";
+ "map stable-security proposed-updates";
+ "map-unreleased stable unstable";
+ "map-unreleased proposed-updates unstable";
+ "map testing woody-proposed-updates";
+ "map testing-security woody-proposed-updates";
+ "map-unreleased testing unstable-";
+ "map-unreleased woody-proposed-updates unstable";
 };
 
 Dir
@@ -368,7 +382,7 @@ Component
 Section
 {
 
-  non-US "";
+  non-US;
 
 };
 
@@ -387,9 +401,9 @@ Priority
 OverrideType
 {
 
-  deb "";
-  udeb "";
-  dsc "";
+  deb;
+  udeb;
+  dsc;
 
 };
 
@@ -410,8 +424,8 @@ Location
       Archive "non-US";
       Suites 
 	{
-	  Stable "";
-	  Unstable "";
+	  Stable;
+	  Unstable;
         };
       Type "legacy";
     };
@@ -430,11 +444,11 @@ Urgency
   Default "low";
   Valid
   {
-    low "";
-    medium "";
-    high "";
-    emergency "";
-    critical "";
+    low;
+    medium;
+    high;
+    emergency;
+    critical;
   };
 };