X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=0e47115b9f364de12c439af996c408d3f06e6e17;hb=2a5088c3c90efe21dd50a5f53f6c59e874d81192;hp=79d5087b7d4a80db259fc201ab30b4bd0504a0cb;hpb=9c413f642e7249f38c29554ac052ad320cedd914;p=dak.git

diff --git a/katie.conf b/katie.conf
index 79d5087b..0e47115b 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
@@ -153,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";
@@ -205,9 +205,14 @@ Suite
 	  };
 	  MustBeOlderThan
 	  {
+	    Testing;
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Stable;
+	  };
 	};
   };
 
@@ -289,6 +294,10 @@ Suite
 	    Unstable;
 	    Experimental;
 	  };
+	  Enhances
+          {
+	    Testing;
+          };
 	};
 	UdebComponents
 	{
@@ -397,6 +406,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";