userdir-ldap.conf: add keyring.pgp to default add_keyrings

diff --git a/debian/changelog b/debian/changelog
index 348d770..3da5836 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.64) unstable; urgency=low
+
+  * userdir-ldap.conf: add keyring.pgp to default add_keyrings.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 06 Apr 2009 01:33:51 +0200
+
 userdir-ldap (0.3.63) unstable; urgency=low
 
   * Print gpg's exit status when it fails.

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 42ffb49..e83995a 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -49,7 +49,7 @@ keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.deb
 # Keyrings synced to other machines, if they need them
 sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp";
 # Keyrings used to search in when new developers get added
-add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
+add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"
 
 # For the WEB interface
 webloginhtml = "login.html";