[evolution-data-server/gnome-3-16] Bug 247661 - [LDAP] Cannot save contact with Calendar and Free/Busy URLs

[Milan Crha <mcrha src gnome org>]

commit 6569f0f4ade3618acf397f6ec5e1bcdea713c964
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jun 16 08:00:38 2015 +0200

    Bug 247661 - [LDAP] Cannot save contact with Calendar and Free/Busy URLs

 addressbook/backends/ldap/evolutionperson.schema |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/addressbook/backends/ldap/evolutionperson.schema 
b/addressbook/backends/ldap/evolutionperson.schema
index cc32a96..97de67d 100644
--- a/addressbook/backends/ldap/evolutionperson.schema
+++ b/addressbook/backends/ldap/evolutionperson.schema
@@ -164,19 +164,15 @@ attributetype ( 1.3.6.1.4.1.8506.1.2.25
        SUP name
        SINGLE-VALUE )
 
-# deprecated - use calEntry and its attributes from RFC 2739
-attributetype ( 1.3.6.1.4.1.8506.1.2.26
-       NAME 'calendarURI'
+attributetype (1.2.840.113556.1.4.478
+        NAME 'calCalURI'
         EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-       SINGLE-VALUE )
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-# deprecated - use calEntry and its attributes from RFC 2739
-attributetype ( 1.3.6.1.4.1.8506.1.2.27
-       NAME 'freeBusyURI'
-        EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-       SINGLE-VALUE )
+attributetype (1.2.840.113556.1.4.479
+       NAME 'calFBURL'
+       EQUALITY caseExactIA5Match
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 attributetype ( 1.3.6.1.4.1.8506.1.2.28
        NAME 'category'
@@ -196,7 +192,7 @@ objectclass ( 1.3.6.1.4.1.8506.1.3.1
                otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $
                otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $
                note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $
-               radio $ telex $ tty $ categories $ category $ calendarURI $ freeBusyURI )
+               radio $ telex $ tty $ categories $ category $ calCalURI $ calFBURL )
        )
 
 # evolutionPersonList