Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

[mirror/userdir-ldap.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index a0e969c..d62afbb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,9 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
   * ud-lock: support supplying a status to set instead of 'retiring'.
   * ud-generate: Also rebuild if one of our keyrings has changed, even if
     ldap has not.
+  * userdir-ldap-slapd.conf.in: explicitly list readable attributes.
+    End with 'by * none'.
+
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
@@ -62,15 +65,15 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
 
   [ Martin Zobel-Helas ]
   * ud-generate: generate webPasswords
+  * ud-generate: generate voipPasswords
   * ud-replicate: set correct permissions for web-passwords
+  * ud-replicate: set correct permissions for voip-passwords
   * add freecdb to depends
   * userdir-ldap.schema
     - add webPasswords
     - add mailPreserveSuffixSeperator
+    - add voipPasswords
 
-  [ Peter Palfrader ]
-  * userdir-ldap-slapd.conf.in: explicitly list readable attributes.
-    End with 'by * none'.
 
  -- Peter Palfrader <weasel@debian.org>  Mon, 14 May 2012 18:45:07 +0200