[pkg-kolab] r1190 - in kolabd/branches/2.2.1/debian: . patches
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Sun Feb 8 14:27:50 UTC 2009
Author: mparent-guest
Date: 2009-02-08 14:27:49 +0000 (Sun, 08 Feb 2009)
New Revision: 1190
Modified:
kolabd/branches/2.2.1/debian/changelog
kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff
Log:
don't install horde schema anymore as horde now use flat files for
preferences
Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog 2009-02-08 11:27:30 UTC (rev 1189)
+++ kolabd/branches/2.2.1/debian/changelog 2009-02-08 14:27:49 UTC (rev 1190)
@@ -11,7 +11,10 @@
* Moved patch: 30-bootstrap to libkolab-perl
* Moved patch: 40-disable-amavis to libkolab-perl
* Updated patch: 55-no-distconf_kolabsrv
- * 90-slapd.template.diff: load module syncprov
+ * 90-slapd.template.diff:
+ - load module syncprov
+ - don't install horde schema anymore as horde now use flat files for
+ preferences
* 92-resmgr-template.diff: freebusy config name is now kolabfilter.conf
* debian/rules
- several perl script are now in libkolab-perl
@@ -37,7 +40,7 @@
* 99-issue3311.diff: port upstream patch
* debian/copyright: refers to versionned license version
- -- Mathieu Parent <math.parent at gmail.com> Tue, 03 Feb 2009 12:24:53 +0100
+ -- Mathieu Parent <math.parent at gmail.com> Sun, 08 Feb 2009 15:23:40 +0100
kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
Modified: kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff 2009-02-08 11:27:30 UTC (rev 1189)
+++ kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff 2009-02-08 14:27:49 UTC (rev 1190)
@@ -39,15 +39,6 @@
# manual additions are lost unless made to the template in the Kolab config directory
# the template is @sysconfdir@/kolab/templates/slapd.conf.template
-@@ -21,7 +27,7 @@
- include @ldapserver_schemadir@/inetorgperson.schema
- include @ldapserver_schemadir@/rfc2739.schema
- include @ldapserver_schemadir@/kolab2.schema
--#include @ldapserver_schemadir@/horde.schema
-+include @ldapserver_schemadir@/horde.schema
-
- pidfile @ldapserver_pidfile@
- argsfile @ldapserver_argsfile@
@@ -31,7 +37,7 @@
# or dynamically build. When build dynamically the module must be loaded.
# As the slapd that comes with the openpkg version of kolab is statically
More information about the pkg-kolab-devel
mailing list