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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-03-27 15:36:53 +0000 (Fri, 27 Mar 2009)
New Revision: 1239

Added:
   kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/series
Log:
  * 95-resmgr-issue1383-issue2499.diff from TRUNK: Prepare kolabd for
    kolab/issue1382 (resmgr accepts concurrent overlapping invitations) and 
    kolab/issue2499 (Notification messages by the resource manager sould be 
    localized)



Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2009-03-17 21:35:21 UTC (rev 1238)
+++ kolabd/branches/2.2.1/debian/changelog	2009-03-27 15:36:53 UTC (rev 1239)
@@ -36,6 +36,10 @@
     - load module syncprov
     - don't install horde schema anymore as horde now use flat files for
       preferences
+  * 95-resmgr-issue1383-issue2499.diff from TRUNK: Prepare kolabd for
+    kolab/issue1382 (resmgr accepts concurrent overlapping invitations) and
+    kolab/issue2499 (Notification messages by the resource manager sould be
+    localized)
   * debian/rules
     - don't create manpage for undocumented (s)bin
   * debian/control:
@@ -52,7 +56,7 @@
     - build-depends on debhelper 7
     - replace 'dh_clean -k' by 'dh_prep'
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 17 Mar 2009 22:29:19 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 27 Mar 2009 16:31:18 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Added: kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff	2009-03-27 15:36:53 UTC (rev 1239)
@@ -0,0 +1,41 @@
+Goal: kolab/issue1382 and kolab/issue2499
+
+Prepare kolabd for kolab/issue1382 (resmgr accepts concurrent overlapping
+invitations) and kolab/issue2499 (Notification messages by the resource
+manager sould be localized)
+
+Author: Gunnar Wrobel  <p at rdus.de>
+
+Upstream status: Already commit on TRUNK
+
+Index: b/templates/resmgr.conf.template.in
+===================================================================
+--- a/templates/resmgr.conf.template.in
++++ b/templates/resmgr.conf.template.in
+@@ -29,7 +29,7 @@
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  *
+- *  $Revision: 1.34 $
++ *  $Revision: 1.35 $
+  *
+  *  ABOUT
+  *  -----
+@@ -157,6 +157,17 @@
+ /* Temporary data storage for the scripts */
+ $conf['kolab']['filter']['tempdir'] = '@resmgr_tmpdir@';
+ 
++/* Uncomment if the resource manager should generate translated messages. */
++//$conf['kolab']['filter']['locale_path'] = '@resmgr_localedir@';
++//$conf['kolab']['filter']['locale'] = 'de_DE';
++
++/* Use locking for the resource manager? */
++$conf['kolab']['filter']['simple_locks'] = true;
++/* Timeout for the locks */
++$conf['kolab']['filter']['simple_locks_timeout'] = 60;
++/* Directory for storing the locks */
++$conf['kolab']['filter']['simple_locks_dir'] = '@resmgr_locksdir@';
++
+ /* PHP error logging */
+ $conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
+ 

Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series	2009-03-17 21:35:21 UTC (rev 1238)
+++ kolabd/branches/2.2.1/debian/patches/series	2009-03-27 15:36:53 UTC (rev 1239)
@@ -3,3 +3,4 @@
 70-kolab2.schema-removal.of.rfc2739.diff 
 90-slapd-template.diff 
 91-postfix-template.diff 
+95-resmgr-issue1383-issue2499.diff