[Da-tools-commits] ./debian/userdir-ldap r512: userdir-ldap.conf: add keyring.pgp to default add_keyrings

[Peter Palfrader]

------------------------------------------------------------
revno: 512
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Mon 2009-04-06 01:34:27 +0200
message:
  userdir-ldap.conf: add keyring.pgp to default add_keyrings
modified:
  debian/changelog
  userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2009-03-23 11:39:49 +0000
+++ b/debian/changelog	2009-04-05 23:34:27 +0000
@@ -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 at 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.

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2008-11-23 20:23:20 +0000
+++ b/userdir-ldap.conf	2009-04-05 23:34:27 +0000
@@ -49,7 +49,7 @@
 # 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";