From 6b70a9f348b861e0423a587abb6d10ca3b2b4de4 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 13 Sep 2010 14:43:20 +0200
Subject: [PATCH] horde.schema includes Turba's schemas now, so we require
 rfc2739.schema in Horde, not Turba.

---
 horde/scripts/ldap/horde.schema              | 3 ++-
 {turba => horde}/scripts/ldap/rfc2739.schema | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename {turba => horde}/scripts/ldap/rfc2739.schema (97%)

diff --git a/horde/scripts/ldap/horde.schema b/horde/scripts/ldap/horde.schema
index bc385342f..2bc2af40d 100644
--- a/horde/scripts/ldap/horde.schema
+++ b/horde/scripts/ldap/horde.schema
@@ -1,7 +1,8 @@
 # The offical horde OID assigned by IANA is 13040.
 #
 # This schema depends on:
-#	- core.schema
+# - core.schema
+# - rfc2739.schema
 #
 #
 # Horde attribute branch 1.3.6.1.4.1.13040.2.1.*
diff --git a/turba/scripts/ldap/rfc2739.schema b/horde/scripts/ldap/rfc2739.schema
similarity index 97%
rename from turba/scripts/ldap/rfc2739.schema
rename to horde/scripts/ldap/rfc2739.schema
index 406aa8d7e..c90ab6993 100644
--- a/turba/scripts/ldap/rfc2739.schema
+++ b/horde/scripts/ldap/rfc2739.schema
@@ -1,6 +1,6 @@
 #
 # http://www.faqs.org/rfcs/rfc2739.html
-# 
+#
 # From the RFC:
 # The calCalURI contains the URI to a snapshot of the user's entire
 # default calendar. The calFBURL contains the URI to the user's default
@@ -88,10 +88,10 @@ attribute (1.2.840.113556.1.4.485
  )
 
 objectclass (1.2.840.113556.1.5.87
- NAME 'calEntry' 
+ NAME 'calEntry'
  DESC 'Calendering and Free Busy information'
  SUP top AUXILIARY
- MAY (calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $ 
+ MAY (calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
       calOtherCalURIs $ calOtherFBURLs $ calOtherCAPURIs $
       calOtherCalAdrURIs
      )
-- 
2.11.0