No more pgp keyring

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

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 755e9188309c78583ae80f5a4e35ee58ef06f89b..2610da38dc94d9a3c697e380746d4a66fb5e3d5b 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
@@ -406,19 +405,19 @@ Suite
 
 SuiteMappings
 {
-# "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny stable";
  "map squeeze testing";
  "map sid unstable";
  "map rc-buggy experimental";
-# "map oldstable oldstable-proposed-updates";
-# "map oldstable-security oldstable-proposed-updates";
+// "map oldstable oldstable-proposed-updates";
+// "map oldstable-security oldstable-proposed-updates";
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
-# "map-unreleased oldstable unstable";
+// "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
  "map testing testing-proposed-updates";