X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=katie.conf-security;h=bb9516d7b9b066d783baba6b9904eb121c54272a;hb=a29673e49824a6c0838df50ab64ac08cf32852d8;hp=25fee0e95ad13750c9ae677e8b6d9643982964f6;hpb=2848b994404dac5dcce3420f89543b91d35d254f;p=dak.git

diff --git a/katie.conf-security b/katie.conf-security
index 25fee0e9..bb9516d7 100644
--- a/katie.conf-security
+++ b/katie.conf-security
@@ -23,7 +23,6 @@ Dinstall
    BXANotify "false";
    AcceptedAutoBuildSuites
    {
-     oldstable;
      stable;
      testing;
    };
@@ -38,16 +37,26 @@ Dinstall
 Julia
 {
   ValidGID "800";
-  // Comma seperated list of users who are in Postgres but not the passwd file
+  // Comma separated list of users who are in Postgres but not the passwd file
   KnownPostgres "postgres,katie,www-data,udmsearch";
 };
 
+Helena
+{
+  Directories
+  {
+    byhand;
+    new;
+    accepted;
+  };
+};
+
 Shania
 {
   Options
   {
     Days 14;
-   };
+  };
  MorgueSubDir "shania";
 };
 
@@ -56,10 +65,10 @@ Melanie
   Options
   {
     Suite "unstable";
-   };
+  };
 
-   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/security.debian.org/katie-log/removals.txt";
+  MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
+  LogFile "/org/security.debian.org/katie-log/removals.txt";
 };
 
 Neve
@@ -94,35 +103,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by charisma (highest wins).
 
-  OldStable
-  {
-	Components 
-	{
-	  updates/main;
-	  updates/contrib;
-	  updates/non-free;
-	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  alpha; 
-	  arm;
-	  i386;
-	  m68k;
-	  powerpc;
-	  sparc;
-	};
-	Announce "katie@security.debian.org";
-	Version "2.2";
-	Origin "Debian";
-	Label "Debian-Security";
-	Description "Debian 2.2 Security Updates";
-	CodeName "potato";
-	OverrideCodeName "potato";
-	CopyKatie "/org/security.debian.org/queue/done/";
-  };
-
   Stable
   {
 	Components 
@@ -195,7 +175,6 @@ Suite
 
 SuiteMappings
 {
- "silent-map oldstable-security oldstable";
  "silent-map stable-security stable";
  // JT - FIXME, hackorama
  "silent-map testing-security stable";
@@ -311,10 +290,14 @@ Section
   doc;
   editors;
   electronics;
+  embedded;
   games;
+  gnome;
   graphics;
   hamradio;
   interpreters;
+  kde;
+  libdevel;
   libs;
   mail;
   math;
@@ -323,6 +306,8 @@ Section
   news;
   oldlibs;
   otherosfs;
+  perl;
+  python;
   science;
   shells;
   sound;
@@ -364,7 +349,6 @@ Location
       Archive "security";
       Suites 
 	{
-	  OldStable;
 	  Stable;
 	  Testing;
         };