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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-03-27 16:06:52 +0000 (Fri, 27 Mar 2009)
New Revision: 1240

Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff
Log:
finish 95-resmgr-issue1383-issue2499.diff


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2009-03-27 15:36:53 UTC (rev 1239)
+++ kolabd/branches/2.2.1/debian/changelog	2009-03-27 16:06:52 UTC (rev 1240)
@@ -56,7 +56,7 @@
     - build-depends on debhelper 7
     - replace 'dh_clean -k' by 'dh_prep'
 
- -- Mathieu Parent <math.parent at gmail.com>  Fri, 27 Mar 2009 16:31:18 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Fri, 27 Mar 2009 17:02:23 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff	2009-03-27 15:36:53 UTC (rev 1239)
+++ kolabd/branches/2.2.1/debian/patches/95-resmgr-issue1383-issue2499.diff	2009-03-27 16:06:52 UTC (rev 1240)
@@ -1,13 +1,3 @@
-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
@@ -39,3 +29,16 @@
  /* PHP error logging */
  $conf['kolab']['filter']['error_log'] = '@resmgr_logdir@/fatal.log';
  
+Index: b/dist_conf/common
+===================================================================
+--- a/dist_conf/common
++++ b/dist_conf/common
+@@ -120,6 +120,8 @@
+ 	-e 's=[@]resmgr_conffile_usr[@]=$(resmgr_conffile_usr)=g' \
+ 	-e 's=[@]resmgr_tmpdir[@]=$(resmgr_tmpdir)=g' \
+ 	-e 's=[@]resmgr_grp[@]=$(resmgr_grp)=g' \
++	-e 's=[@]resmgr_locksdir[@]=$(resmgr_locksdir)=g' \
++	-e 's=[@]resmgr_localedir[@]=$(resmgr_localedir)=g' \
+ 	-e 's=[@]resmgr_logdir[@]=$(resmgr_logdir)=g' \
+ 	-e 's=[@]resmgr_scriptsdir[@]=$(resmgr_scriptsdir)=g' \
+ 	-e 's=[@]resmgr_usr[@]=$(resmgr_usr)=g' \