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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-02-10 22:00:32 +0000 (Tue, 10 Feb 2009)
New Revision: 1196

Added:
   kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/series
Log:
98-freebusy-ldap.diff: freebusy.conf.template: ldap server can be on
    another machine

reorganized changelog


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2009-02-10 21:51:53 UTC (rev 1195)
+++ kolabd/branches/2.2.1/debian/changelog	2009-02-10 22:00:32 UTC (rev 1196)
@@ -1,31 +1,31 @@
 kolabd (2.2.1-20081212-1) UNRELEASED; urgency=low
 
   * New beta release 2.2.1-beta-1
-  * Integrated patches (wow!):
-    - 10-dist_conf
-    - 50-postfix-hashes
-    - 60-kolabdcachetool-cachefiles
-    - 80-kolab_globals
-    - 85-slapd-2.4-compat
-    - 86-slapd-syncrepl-24
-  * Moved patch: 30-bootstrap to libkolab-perl 
-  * Moved patch: 40-disable-amavis to libkolab-perl 
-  * Updated patch: 55-no-distconf_kolabsrv
+    + Integrated patches (wow!):
+      - 10-dist_conf
+      - 50-postfix-hashes
+      - 60-kolabdcachetool-cachefiles
+      - 80-kolab_globals
+      - 85-slapd-2.4-compat
+      - 86-slapd-syncrepl-24
+    + Moved patch: 30-bootstrap to libkolab-perl 
+    + Moved patch: 40-disable-amavis to libkolab-perl 
+    + Updated patch: 55-no-distconf_kolabsrv
+      - depends on 2.2.1 version of libkolab-perl as binaries are now there
+    + several perl script are now in libkolab-perl
+    + kolabconf has been integrated in libkolab-perl, remove dependency 
+    + kolab.conf removed (kolab/issue2994)
+    + debian/kolabd.lintian-overrides: removed, as kolab.conf is removed
+    + replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
+      depends 
   * 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
-    - kolab.conf removed (kolab/issue2994)
     - don't create manpage for undocumented (s)bin
-  * debian/kolabd.lintian-overrides: removed, as kolab.conf is removed
   * debian/control:
-    - depends on 2.2.1 version of libkolab-perl as binaries are now there
-    - kolabconf has been integrated in libkolab-perl, remove dependency 
-    - replaces kolab-{freebusy,filter} by php-kolab-{freebusy,filter} in
-      depends 
     - suggests clamav, clamav-daemon, spamassassin 
   * taken from kolab-freebusy:
     - apache.conf (referenced path changed)
@@ -37,6 +37,8 @@
     - backups are now in /var/lib/kolab/backups instead of 
       /var/lib/backups/kolab (Closes: #510210)
     - kolabfilter is now in /usr/bin/
+  * 98-freebusy-ldap.diff: freebusy.conf.template: ldap server can be on
+    another machine
   * 99-issue3311.diff: port upstream patch 
   * debian/copyright: refers to versionned license version
 

Added: kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/patches/98-freebusy-ldap.diff	2009-02-10 22:00:32 UTC (rev 1196)
@@ -0,0 +1,19 @@
+Goal: freebusy.conf.template: ldap server can be on another machine
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: https://www.intevation.de/roundup/kolab/issue3322
+
+Index: b/templates/freebusy.conf.template.in
+===================================================================
+--- a/templates/freebusy.conf.template.in
++++ b/templates/freebusy.conf.template.in
+@@ -53,7 +53,7 @@
+ ini_set('error_log', '@freebusy_logdir@/php-error.log');
+ 
+ /* Horde::Kolab::LDAP configuration */
+-$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
++$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
+ $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
+ $conf['kolab']['ldap']['phpdn']  = '@@@php_dn@@@';
+ $conf['kolab']['ldap']['phppw']  = '@@@php_pw@@@';

Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series	2009-02-10 21:51:53 UTC (rev 1195)
+++ kolabd/branches/2.2.1/debian/patches/series	2009-02-10 22:00:32 UTC (rev 1196)
@@ -5,4 +5,5 @@
 91-postfix-template.diff 
 92-resmgr-template.diff 
 93-freebusy-template.diff 
+98-freebusy-ldap.diff
 99-issue3331.diff