[pkg-kolab] r796 - in kolabd/branches/2.2/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Thu Apr 17 20:18:28 UTC 2008
Author: mparent-guest
Date: 2008-04-17 20:18:27 +0000 (Thu, 17 Apr 2008)
New Revision: 796
Added:
kolabd/branches/2.2/debian/rfc2739.schema
Modified:
kolabd/branches/2.2/debian/changelog
kolabd/branches/2.2/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
kolabd/branches/2.2/debian/patches/90-slapd-template.dpatch
kolabd/branches/2.2/debian/rules
Log:
Re-add rfc2739 schema
Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog 2008-04-13 13:06:51 UTC (rev 795)
+++ kolabd/branches/2.2/debian/changelog 2008-04-17 20:18:27 UTC (rev 796)
@@ -1,3 +1,9 @@
+kolabd (2.1.99+20080314.dfsg-6) experimental; urgency=low
+
+ * Re-add rfc2739 schema with a copyright notice
+
+ -- Mathieu Parent <math.parent at gmail.com> Thu, 17 Apr 2008 22:05:29 +0200
+
kolabd (2.1.99+20080314.dfsg-5) experimental; urgency=low
* Updated patch 50-postfix-hashes with a RUNONCHANGE for virtual
Modified: kolabd/branches/2.2/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2008-04-13 13:06:51 UTC (rev 795)
+++ kolabd/branches/2.2/debian/patches/70-kolab2.schema-removal.of.rfc2739.dpatch 2008-04-17 20:18:27 UTC (rev 796)
@@ -1,7 +1,8 @@
#!/bin/sh /usr/share/dpatch/dpatch-run
## 70-kolab2.schema-removal.of.rfc2739.dpatch by Noèl Köthe <noel at debian.org>
##
-## DP: remove calFBURL from the schema because rfc2739 has to be removed
+## DP: remove upstream rfc2739 schema because it is not dfsg
+## DP: see rules that install a dfsg version of it
@DPATCH@
diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/Makefile.am kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/Makefile.am
@@ -30,26 +31,4 @@
ldapschemadir = $(ldapserver_confdir)/schema
dist_ldapschema_DATA = $(ldapschema_FILES)
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/kolab2.schema kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/kolab2.schema
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/kolab2.schema 2007-02-02 16:16:45.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/kolab2.schema 2007-06-21 20:18:14.000000000 +0200
-@@ -601,7 +601,6 @@
- cyrus-userquota $
- kolabInvitationPolicy $
- kolabFreeBusyFuture $
-- calFBURL $
- kolabVacationBeginDateTime $
- kolabVacationEndDateTime $
- kolabVacationResendInterval $
-diff -urNad kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/templates/slapd.conf.template.in kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/templates/slapd.conf.template.in
---- kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846~/templates/slapd.conf.template.in 2007-05-08 11:39:04.000000000 +0200
-+++ kolabd-2.1.0-20070510.dfsg.obsolete.0.391802680053846/templates/slapd.conf.template.in 2007-06-21 20:18:37.000000000 +0200
-@@ -19,7 +19,7 @@
- include @ldapserver_schemadir@/core.schema
- include @ldapserver_schemadir@/cosine.schema
- include @ldapserver_schemadir@/inetorgperson.schema
--include @ldapserver_schemadir@/rfc2739.schema
-+#include @ldapserver_schemadir@/rfc2739.schema
- include @ldapserver_schemadir@/kolab2.schema
- #include @ldapserver_schemadir@/horde.schema
-
+
Modified: kolabd/branches/2.2/debian/patches/90-slapd-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/90-slapd-template.dpatch 2008-04-13 13:06:51 UTC (rev 795)
+++ kolabd/branches/2.2/debian/patches/90-slapd-template.dpatch 2008-04-17 20:18:27 UTC (rev 796)
@@ -35,7 +35,7 @@
@@ -20,8 +26,8 @@
include @ldapserver_schemadir@/cosine.schema
include @ldapserver_schemadir@/inetorgperson.schema
- #include @ldapserver_schemadir@/rfc2739.schema
+ include @ldapserver_schemadir@/rfc2739.schema
-include @ldapserver_schemadir@/kolab2.schema
-#include @ldapserver_schemadir@/horde.schema
+include /usr/share/kolabd/schema/kolab2.schema
Added: kolabd/branches/2.2/debian/rfc2739.schema
===================================================================
--- kolabd/branches/2.2/debian/rfc2739.schema (rev 0)
+++ kolabd/branches/2.2/debian/rfc2739.schema 2008-04-17 20:18:27 UTC (rev 796)
@@ -0,0 +1,146 @@
+# (c) 2004 Martin Konold <martin.konold at erfrakon.de>
+
+# This schema is derived from RFC 2739 and may act as a substitute
+# when used with OpenLDAP as the original schema from RFC 2739
+# is syntactically not accepted by OpenLDAP 2.2.14
+#
+
+# The version of this file as distributed in the Kolab upstream packages
+# contains text claiming copyright by the Internet Society and including
+# the IETF RFC license, which does not meet Debian's Free Software
+# Guidelines. However, apart from short and obvious comments, the text of
+# this file is purely a functional interface specification, which is not
+# subject to that license and is not copyrightable under US law.
+#
+# The license statement is retained below so as not to remove credit, but
+# as best as we can determine, it is not applicable to the contents of
+# this file.
+
+# Copyright (C) The Internet Society (2000). All Rights Reserved.
+#
+# This document and translations of it may be copied and furnished to
+# others, and derivative works that comment on or otherwise explain it
+# or assist in its implementation may be prepared, copied, published
+# and distributed, in whole or in part, without restriction of any
+# kind, provided that the above copyright notice and this paragraph are
+# included on all such copies and derivative works. However, this
+# document itself may not be modified in any way, such as by removing
+# the copyright notice or references to the Internet Society or other
+# Internet organizations, except as needed for the purpose of
+# developing Internet standards in which case the procedures for
+# copyrights defined in the Internet Standards process must be
+# followed, or as required to translate it into languages other than
+# English.
+#
+# The limited permissions granted above are perpetual and will not be
+# revoked by the Internet Society or its successors or assigns.
+#
+# This document and the information contained herein is provided on an
+# "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+# TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+# BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+# HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+# slapd.conf then looks like
+# include /kolab/etc/openldap/schema/core.schema
+# include /kolab/etc/openldap/schema/cosine.schema
+# include /kolab/local/etc/openldap/schema/inetorgperson.schema
+# include /kolab/local/etc/openldap/schema/rfc2739.schema
+# include /kolab/local/etc/openldap/schema/kolab2.schema
+
+#
+################################
+# rfc 2739 calendar attributes #
+################################
+
+# contains the URI to a snapshot of the user's entire
+# default calendar
+attributetype ( 1.2.840.113556.1.4.478
+ NAME 'calCalURI'
+ DESC 'RFC2739: URI of entire default calendar'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# contains the URI to the user's default
+# busy time data
+attributetype (1.2.840.113556.1.4.479
+ NAME 'calFBURL'
+ DESC 'RFC2739: URI to the users default freebusy data'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# contains a URI that can be used to communicate with
+# the user's calendar
+attributetype (1.2.840.113556.1.4.480
+ NAME 'calCAPURI'
+ DESC 'RFC2739: URI used to communicate with the users calendar'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# contains a URI that points to the location to which event
+# requests should be sent for that user
+attributetype (1.2.840.113556.1.4.481
+ NAME 'calCalAdrURI'
+ DESC 'RFC2739: URI for event equests destination'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# multi-valued property containing URIs to snapshots of
+# other calendars that the user may have
+attributetype (1.2.840.113556.1.4.482
+ NAME 'calOtherCalURIs'
+ DESC 'RFC2739: multi-value URI for snapshots of other calendars'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# multi-valued property containing URIs to snapshots of other
+# free/busy data that the user may have
+attributetype (1.2.840.113556.1.4.483
+ NAME 'calOtherFBURLs'
+ DESC 'RFC2739: multi-value URI for other free/busy data'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# multi-valued property containing URI to other calendars that
+# the user may have
+attributetype (1.2.840.113556.1.4.484
+ NAME 'calOtherCAPURIs'
+ DESC 'RFC2739: multi-value URI to other calendars'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+# URIs to other locations that a user may want
+# event requests sent to
+attributetype (1.2.840.113556.1.4.485
+ NAME 'calOtherCalAdrURIs'
+ DESC 'RFC2739: multi-value URI to other request destinations'
+ EQUALITY caseIgnoreIA5Match
+ SUBSTR caseIgnoreIA5SubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+ USAGE userApplications )
+
+objectclass (1.2.840.113556.1.5.87
+ NAME 'calEntry'
+ DESC 'RFC2739: Calendar Entry'
+ SUP top AUXILIARY
+ MAY ( calCalURI $
+ calFBURL $
+ calOtherCalURIs $
+ calOtherFBURLs $
+ calCAPURI $
+ calOtherCAPURIs ) )
Modified: kolabd/branches/2.2/debian/rules
===================================================================
--- kolabd/branches/2.2/debian/rules 2008-04-13 13:06:51 UTC (rev 795)
+++ kolabd/branches/2.2/debian/rules 2008-04-17 20:18:27 UTC (rev 796)
@@ -55,6 +55,7 @@
rm $(addprefix debian/kolabd/etc/kolab/templates/,amavisd.* clamd.* cyrus.* freshclam.* httpd.* session_vars.*)
# LDAP files
+ install -D -m 644 debian/rfc2739.schema debian/kolabd/etc/ldap/schema/rfc2739.schema
install -D -m 644 horde.schema debian/kolabd/usr/share/kolabd/schema/horde.schema
install -D -m 644 kolab2.schema debian/kolabd/usr/share/kolabd/schema/kolab2.schema
More information about the pkg-kolab-devel
mailing list