Merge from security

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

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index f727acfe7da098f2d24c1bff56ff6e5f992631d4..bc978ee20a413e4f638955203f4c91bb48ce760b 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -1,7 +1,9 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+   GPGKeyring {
+     "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
+   };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
@@ -194,6 +196,7 @@ Suite
          amd64; 
          alpha; 
          arm;
+         armel;
          hppa;
          i386;
          ia64;
@@ -249,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/";
@@ -272,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";