[pkg-kolab] r881 - in kolabd/branches/2.2/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-06-10 21:43:35 +0000 (Tue, 10 Jun 2008)
New Revision: 881

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/patches/80-kolab_globals.dpatch
Log:
* cleaned directory_more
* more comprehensive changelog


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-06-08 20:39:21 UTC (rev 880)
+++ kolabd/branches/2.2/debian/changelog	2008-06-10 21:43:35 UTC (rev 881)
@@ -1,7 +1,7 @@
 kolabd (2.1.99-20080521.dfsg-1) experimental; urgency=low
 
   * New upstream version: 2.2-rc2
-    - updated 80-kolab-syslog-facility.dpatch: partially applied upstream
+    - removed 80-kolab-syslog-facility.dpatch: partially applied upstream
   * README.Debian: 
     - Mention which daemons to stop/start,
     - Remove unneeded creation of cyrus mailboxes
@@ -10,7 +10,6 @@
       within postfix
     - remove /etc/kolab/templates/local.cf.template (new amavisd config)
   * updated common/dist_conf.dpatch
-    - use FDS LDAP backend for persistent searches
     - smarty has now the good path
     - mostly integrated upstream
   * updated patch 30-bootstrap to run newaliases at the end of kolab_bootstrap
@@ -20,10 +19,13 @@
       kolabconf doesn't need to know about postfix
   * new patch 55-no-distconf_kolabsrv: distconf/kolabsrv.in is not shipped in.
     We don't need it anyway.
+  * new patch 80-kolab_globals.dpatch:
+    - use FDS LDAP backend for persistent searches
+    - use syslog
   * new patch 85-slapd-2.4-compat: to be compatible with slapd 2.4
   * new patch 86-slapd-syncrepl-24: to enable syncrepl and disable slurpd
     (Closes: #463791)
-  * updated patch 80-slapd-template: enable horde.schema by default 
+  * updated patch 90-slapd-template: enable horde.schema by default 
   * updated patch 91-postfix-template: partially applied upstream
   * updated patch 92-resmgr-template, path is now /etc/kolab/filter/config.php
     and format has changed (updated debian/dirs accordingly)
@@ -34,7 +36,7 @@
     http://lists.debian.org/debian-legal/2008/04/msg00087.html
   * debian/postinst: add user cyrus to group kolab. This is needed for PKI.
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 08 Jun 2008 22:38:44 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 10 Jun 2008 23:38:36 +0200
 
 kolabd (2.1.0-20070510.dfsg-3) unstable; urgency=low
 

Modified: kolabd/branches/2.2/debian/patches/80-kolab_globals.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/80-kolab_globals.dpatch	2008-06-08 20:39:21 UTC (rev 880)
+++ kolabd/branches/2.2/debian/patches/80-kolab_globals.dpatch	2008-06-10 21:43:35 UTC (rev 881)
@@ -1,16 +1,25 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 80-kolab-syslog-facility.dpatch by Marc Brockschmidt <marc.brockschmidt at credativ.de>
 ##
-## DP: Use syslog
+## DP: -Use Fedora Directory Server (persistent searches) LDAP backend
+## DP: -Use syslog
 
 @DPATCH@
-diff -urNad kolabd-2.1.99+20080314.dfsg~/kolab.globals.in kolabd-2.1.99+20080314.dfsg/kolab.globals.in
---- kolabd-2.1.99+20080314.dfsg~/kolab.globals.in	2008-03-06 09:26:25.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/kolab.globals.in	2008-03-17 20:22:35.000000000 +0100
-@@ -48,4 +48,5 @@
+diff -urNad kolabd-2.1.99-20080521.dfsg~/kolab.globals.in kolabd-2.1.99-20080521.dfsg/kolab.globals.in
+--- kolabd-2.1.99-20080521.dfsg~/kolab.globals.in	2008-06-10 23:34:22.000000000 +0200
++++ kolabd-2.1.99-20080521.dfsg/kolab.globals.in	2008-06-10 23:35:00.000000000 +0200
+@@ -7,7 +7,7 @@
+ cyrus-pop3 : FALSE
+ cyrus-pop3s : TRUE
+ cyrus-sieve : TRUE
+-directory_mode : slurpd
++directory_mode : fds
+ gyard_deletion_period : 10080
+ ldap_uri : ldap://127.0.0.1:389
+ log_level : 2
+@@ -48,4 +48,4 @@
  bind_any : TRUE
  bind_addr : 0.0.0.0
  calendar_id : calendar
 -syslog_facility : user
 +syslog_facility : local5
-+directory_mode : fds