Merge branch 'master' into security

[dak.git] / config / debian-security / dak.conf

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index fb219e5e52f0d46acce7a0e1a50d3731e56da675..6e2ebc708f604381ea53db4952ae1dfeec10f978 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -31,7 +31,7 @@ Dinstall
    };
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
-   DefaultSuite "oldstable";
+   DefaultSuite "stable";
    SuiteSuffix "updates";
    OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
@@ -196,6 +196,7 @@ Suite
          amd64; 
          alpha; 
          arm;
+         armel;
          hppa;
          i386;
          ia64;
@@ -251,6 +252,7 @@ Dir
     Reject "/org/security.debian.org/queue/reject/";
     Unchecked "/org/security.debian.org/queue/unchecked/";
     ProposedUpdates "/does/not/exist/"; // XXX fixme
+    OldProposedUpdates "/does/not/exist/"; // XXX fixme
 
     Embargoed "/org/security.debian.org/queue/embargoed/";
     Unembargoed "/org/security.debian.org/queue/unembargoed/";
@@ -274,6 +276,7 @@ Architectures
   alpha "DEC Alpha";
   hppa "HP PA RISC";
   arm "ARM";
+  armel "ARM EABI";
   i386 "Intel ia32";
   ia64 "Intel ia64";
   m68k "Motorola Mc680x0";