userdir-ldap.conf: remove from default keyrings:

 - /home/jgg/keys/extrakeys.gpg
 - /home/jgg/keys/guest-keys.gpg

diff --git a/debian/changelog b/debian/changelog
index b26f4bb..ea98b67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+userdir-ldap (0.3.65) unstable; urgency=low
+
+  * userdir-ldap.conf: remove from default keyrings:
+    - /home/jgg/keys/extrakeys.gpg
+    - /home/jgg/keys/guest-keys.gpg
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 06 Apr 2009 01:40:37 +0200
+
 userdir-ldap (0.3.64) unstable; urgency=low
 
   * userdir-ldap.conf: add keyring.pgp to default add_keyrings.

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index e83995a..3ace1f0 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -45,9 +45,9 @@ passdir = "/etc/userdir-ldap/";
 # GPG Things
 gpg = "/usr/bin/gpg";
 # The whole set of all keyrings
-keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.gpg";
+keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp"
 # 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";
+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:/org/keyring.debian.org/keyrings/debian-keyring.pgp"