X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=config%2Fdebian-security%2Fdak.conf;h=ade76eef359203e904d2ff1ce9ed077ed7fc3ce8;hb=955ee64ea41bb7afb1c6a64d256c4bfc7f834cd9;hp=a71b85563254d047e83022b8e4a3aef9d71dc05b;hpb=af33f894e66793aaa707327a9a85ee61a809995f;p=dak.git

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index a71b8556..ade76eef 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -119,22 +119,6 @@ Suite
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "dak@security.debian.org";
 	Version "";
 	Origin "Debian";
@@ -154,23 +138,6 @@ Suite
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures 
-	{
-	  source;  
-	  all;
-	  amd64; 
-	  alpha; 
-	  arm;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "dak@security.debian.org";
 	Version "";
 	Origin "Debian";
@@ -190,22 +157,6 @@ Suite
 	  updates/contrib;
 	  updates/non-free;
 	};
-	Architectures
-	{
-	  source;
-	  all;
-	  amd64;
-	  alpha;
-	  armel;
-	  hppa;
-	  i386;
-	  ia64;
-	  mips;
-	  mipsel;
-	  powerpc;
-	  s390;
-	  sparc;
-	};
 	Announce "dak@security.debian.org";
 	Version "";
 	Origin "Debian";
@@ -221,6 +172,7 @@ Suite
 SuiteMappings
 {
  "silent-map stable-security stable";
+ "silent-map oldstable-security oldstable";
  // JT - FIXME, hackorama
  // "silent-map testing-security stable";
   "silent-map etch-secure oldstable";
@@ -338,31 +290,45 @@ ComponentMappings
 Section
 {
   admin;
-  base;
+  cli-mono;
   comm;
+  database;
   debian-installer;
+  debug;
   devel;
   doc;
   editors;
-  electronics;
   embedded;
+  electronics;
+  fonts;
   games;
   gnome;
   graphics;
+  gnu-r;
+  gnustep;
   hamradio;
+  haskell;
+  httpd;
   interpreters;
+  java;
   kde;
+  kernel;
   libdevel;
   libs;
+  lisp;
+  localization;
   mail;
   math;
   misc;
   net;
   news;
+  ocaml;
   oldlibs;
   otherosfs;
   perl;
+  php;
   python;
+  ruby;
   science;
   shells;
   sound;
@@ -370,8 +336,9 @@ Section
   text;
   utils;
   web;
+  vcs;
+  video;
   x11;
-  non-US;
 };
 
 Priority
@@ -393,12 +360,6 @@ OverrideType
 
 Location
 {
-  /org/security.debian.org/ftp/dists/
-    {
-      Archive "security";
-      Type "legacy";
-    };
-
   /org/security.debian.org/ftp/pool/
     {
       Archive "security";