[Da-tools-commits] ./debian/userdir-ldap r412: Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)

[Peter Palfrader]

------------------------------------------------------------
revno: 412
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Sun 2008-05-18 14:28:28 +0200
message:
  Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)
modified:
  debian/changelog
  userdir-ldap.schema
    ------------------------------------------------------------
    revno: 349.2.46
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 12:49:46 +0200
    message:
      Merge from Debian
    modified:
      debian/changelog
      ud-generate
      ud-mailgate
      ud-replicate
    ------------------------------------------------------------
    revno: 349.2.47
    committer: Martin Zobel-Helas <zobel at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 13:05:54 +0200
    message:
      * fix userdir-ldap.schema, now contains MAY: VoIP
      * Add changelog-entry
    modified:
      debian/changelog
      userdir-ldap.schema
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 12:26:33 +0000
+++ b/debian/changelog	2008-05-18 12:28:28 +0000
@@ -1,4 +1,4 @@
-userdir-ldap (0.3.XX) Xnstable; urgency=low
+userdir-ldap (0.3.26) unstable; urgency=low
 
   * ud-replicate: sgran pointed out that if all we care about ignoring is
     EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
@@ -6,8 +6,9 @@
   * ud-mailgate: a bug in DoSSH caused all changes to fail that came after
     DoSSH in HandleChange.  Now DoSSH properly returns without raising an
     exception if the line to handle is not an ssh public key.
+  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP). [zobel]
 
- -- Peter Palfrader <weasel at debian.org>  Sun, 18 May 2008 14:25:26 +0200
+ -- Peter Palfrader <weasel at debian.org>  Sun, 18 May 2008 14:27:50 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 

=== modified file 'userdir-ldap.schema'
--- a/userdir-ldap.schema	2008-05-10 12:19:22 +0000
+++ b/userdir-ldap.schema	2008-05-18 11:05:54 +0000
@@ -474,7 +474,7 @@
 	      jabberJID $ keyFingerPrint $ latitude $ longitude $ mn $
 	      onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
 	      access $ gender $ birthDate $ mailCallout $ mailGreylisting $
-              mailRBL $ mailRHSBL $ mailWhitelist
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2