[pkg-kolab] r1078 - in kolabd/branches/2.2.1/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-17 15:36:31 +0000 (Wed, 17 Dec 2008)
New Revision: 1078

Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff
Log:
load module syncprov


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-17 15:22:25 UTC (rev 1077)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-17 15:36:31 UTC (rev 1078)
@@ -11,6 +11,7 @@
   * 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
   * 92-resmgr-template.diff: freebusy config path has changed
   * debian/rules
     - several perl script are now in libkolab-perl
@@ -24,7 +25,7 @@
       depends 
     - suggests clamav, clamav-daemon, spamassassin 
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 14:49:05 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 16:33:31 +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	2008-12-17 15:22:25 UTC (rev 1077)
+++ kolabd/branches/2.2.1/debian/patches/90-slapd-template.diff	2008-12-17 15:36:31 UTC (rev 1078)
@@ -39,14 +39,21 @@
  # manual additions are lost unless made to the template in the Kolab config directory
  # the template is  @sysconfdir@/kolab/templates/slapd.conf.template
  
-@@ -20,8 +26,8 @@
- include @ldapserver_schemadir@/cosine.schema
+@@ -21,7 +27,7 @@
  include @ldapserver_schemadir@/inetorgperson.schema
  include @ldapserver_schemadir@/rfc2739.schema
--include @ldapserver_schemadir@/kolab2.schema
+ include @ldapserver_schemadir@/kolab2.schema
 -#include @ldapserver_schemadir@/horde.schema
-+include @ldapserver_schemadir@/kolab2.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
+ # build it is not necessary to load the module.
+-# moduleload syncprov
++moduleload syncprov
+ @@@else@@@
+ replica-pidfile	@ldapserverslurpd_pidfile@
+ replogfile      @ldapserver_replogfile@