X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=d7b4c5f1484720b78472a7ec2206024991a0bc47;hb=7de8df23c5dfc16a9caf283c4d42489a68c00634;hp=43f7e7dd5c23ecb7c168a2a26d2f69f5e3f5947f;hpb=3686a00f1001f2d5692fa5e706b898053e39191a;p=dak.git

diff --git a/katie.conf b/katie.conf
index 43f7e7dd..d7b4c5f1 100644
--- a/katie.conf
+++ b/katie.conf
@@ -23,6 +23,7 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    StableDislocationSupport "false";
+   DefaultSuite "unstable";
    AcceptedAutoBuildSuites
    {
      unstable;
@@ -43,13 +44,12 @@ Billie
   FTPPath "/org/ftp.debian.org/ftp";
   TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
   TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs";
-  BasicTrees { i386; powerpc; };
+  BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
   CombinationTrees
   {
     popular { i386; powerpc; all; source; };
-    welovehp { hppa; ia64; all; source; };
-    embedded { arm; mips; mipsel; source; };
     source { source; };
+    everything { source; all; alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k; };
   };
 };
 
@@ -101,7 +101,7 @@ Neve
 Lauren
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
-   MoreInfoURL "http://people.debian.org/~joey/3.0r2/";
+   MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
 };
 
 Emilie
@@ -123,7 +123,6 @@ Rhona
   StayOfExecution 129600; // 1.5 days
   AcceptedAutoBuildStayOfExecution 86400; // 24 hours
   MorgueSubDir "rhona";
-  OverrideFilename "override.source-only";
 };
 
 Suite
@@ -154,9 +153,9 @@ Suite
 	  sparc;
 	};
 	Announce "debian-changes@lists.debian.org";
-	Version "3.0r2";
+	Version "3.0r4";
 	Origin "Debian";
-	Description "Debian 3.0r2 Released 20th November 2003";
+	Description "Debian 3.0r4 Released 31st December 2004";
 	CodeName "woody";
 	OverrideCodeName "woody";
 	Priority "3";
@@ -206,9 +205,14 @@ Suite
 	  };
 	  MustBeOlderThan
 	  {
+	    Testing;
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Stable;
+	  };
 	};
   };
 
@@ -236,6 +240,7 @@ Suite
 	  s390;
 	  sparc;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution - Not Released";
 	CodeName "sarge";
@@ -271,6 +276,7 @@ Suite
 	  s390;
 	  sparc;
 	};
+	Announce "debian-testing-changes@lists.debian.org";
 	Origin "Debian";
 	Description "Debian Testing distribution updates - Not Released";
 	CodeName "testing-proposed-updates";
@@ -290,6 +296,10 @@ Suite
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Testing;
+          };
 	};
 	UdebComponents
 	{
@@ -398,6 +408,8 @@ Suite
 
 SuiteMappings
 {
+ "propup-version stable-security testing testing-proposed-updates unstable";
+ "propup-version testing-security unstable";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map-unreleased stable unstable";
@@ -414,7 +426,6 @@ Dir
   Pool "/org/ftp.debian.org/ftp/pool/";
   Templates "/org/ftp.debian.org/katie/templates/";
   PoolRoot "pool/";
-  Override "/org/ftp.debian.org/scripts/override/";
   Lists "/org/ftp.debian.org/database/dists/";
   Log "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";