X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf-non-US;h=be37b8344fa79390b9f72120fda9e5abd4e34ca4;hb=ab41ecb56d308bb801add07b90a258c0b57718e1;hp=4408acbf4e6df2c59ef1cb30fbbe62fb461e6408;hpb=cf9191d93b615e963fff8fe73afd719ec13f679b;p=dak.git

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 4408acbf..be37b834 100644
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -18,9 +18,12 @@ Dinstall
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   FutureTimeTravelGrace "8640"; // 6 hours
+   FutureTimeTravelGrace 28800; // 6 hours
    PastCutoffYear "1984";
-   BXANotify 0;
+   BXANotify "false";
+   SkipTime 300;
+   CloseBugs "true";
+   OverrideDisparityCheck "true";
 };
 
 Julia
@@ -133,9 +136,9 @@ Suite
 	  sparc "";
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "2.2r5";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Debian 2.2r5 Released 10th January 2002";
+	Description "Debian 2.2r6 Released 3rd April 2002";
 	CodeName "potato";
 	OverrideCodeName "potato";
 	Priority "1";
@@ -158,9 +161,10 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	Version "2.2r5";
+	CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+	Version "2.2r6";
 	Origin "Debian";
-	Description "Proposed Updates for Debian 2.2r5 - Not Released";
+	Description "Proposed Updates for Debian 2.2r6 - Not Released";
 	CodeName "proposed-updates";
 	OverrideCodeName "potato";
 	OverrideSuite "stable";
@@ -265,27 +269,37 @@ Suite
 
 };
 
+SuiteMappings
+{
+ "map stable proposed-updates"
+ "map-unreleased stable unstable"
+ "map-unreleased proposed-updates unstable"
+ "ignore testing"
+};
+
 Dir
 {
-  RootDir "/org/non-us.debian.org/ftp/";
-  PoolDir "/org/non-us.debian.org/ftp/pool/";
+  Root "/org/non-us.debian.org/ftp/";
+  Pool "/org/non-us.debian.org/ftp/pool/";
   PoolRoot "pool/";
-  TemplatesDir "/org/non-us.debian.org/katie/templates/";
-  IncomingDir "/org/non-us.debian.org/incoming/";
-  OverrideDir "/org/non-us.debian.org/scripts/override/";
-  ListsDir "/org/non-us.debian.org/database/dists/";
-  LogDir "/org/non-us.debian.org/log/";
+  Templates "/org/non-us.debian.org/katie/templates/";
+  Override "/org/non-us.debian.org/scripts/override/";
+  Lists "/org/non-us.debian.org/database/dists/";
+  Log "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";
-  MorgueRejectDir "reject";
-  QueueRootDir "/org/non-us.debian.org/queue/";
-  QueueAcceptedDir "/org/non-us.debian.org/queue/accepted/";
-  QueueByhandDir "/org/non-us.debian.org/queue/byhand/";
-  QueueDoneDir "/org/non-us.debian.org/queue/done/";
-  QueueHoldingDir "/org/non-us.debian.org/queue/holding/";
-  QueueNewDir "/org/non-us.debian.org/queue/new/";
-  QueueRejectDir "/org/non-us.debian.org/queue/reject/";
-  QueueUncheckedDir "/org/non-us.debian.org/queue/unchecked/";
-  UrgencyLogDir "/org/non-us.debian.org/testing/";
+  MorgueReject "reject";
+  UrgencyLog "/org/non-us.debian.org/testing/";
+  Queue
+  {
+    Root "/org/non-us.debian.org/queue/";
+    Accepted "/org/non-us.debian.org/queue/accepted/";
+    Byhand "/org/non-us.debian.org/queue/byhand/";
+    Done "/org/non-us.debian.org/queue/done/";
+    Holding "/org/non-us.debian.org/queue/holding/";
+    New "/org/non-us.debian.org/queue/new/";
+    Reject "/org/non-us.debian.org/queue/reject/";
+    Unchecked "/org/non-us.debian.org/queue/unchecked/";
+  };
 };
 
 DB