[pkg-kolab] r1238 - kolab-webadmin/branches/2.2.1/debian kolab-webadmin/branches/2.2.1/debian/patches kolabd/branches/2.2.1/debian kolabd/branches/2.2.1/debian/patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-03-17 21:35:21 +0000 (Tue, 17 Mar 2009)
New Revision: 1238

Modified:
   kolab-webadmin/branches/2.2.1/debian/changelog
   kolab-webadmin/branches/2.2.1/debian/patches/10-dist_conf.diff
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
Log:
10-dist_conf.diff: added resmgr_locksdir and resmgr_localedir


Modified: kolab-webadmin/branches/2.2.1/debian/changelog
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/changelog	2009-03-17 12:13:37 UTC (rev 1237)
+++ kolab-webadmin/branches/2.2.1/debian/changelog	2009-03-17 21:35:21 UTC (rev 1238)
@@ -13,7 +13,7 @@
     - build-depends on debhelper 7
     - replace 'dh_clean -k' by 'dh_prep'
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 17 Mar 2009 12:07:54 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 17 Mar 2009 22:30:36 +0100
 
 kolab-webadmin (2.2.0-20080709-2) UNRELEASED; urgency=low
 

Modified: kolab-webadmin/branches/2.2.1/debian/patches/10-dist_conf.diff
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/patches/10-dist_conf.diff	2009-03-17 12:13:37 UTC (rev 1237)
+++ kolab-webadmin/branches/2.2.1/debian/patches/10-dist_conf.diff	2009-03-17 21:35:21 UTC (rev 1238)
@@ -8,16 +8,23 @@
 ===================================================================
 --- a/dist_conf/debian
 +++ b/dist_conf/debian
-@@ -153,7 +153,7 @@
+@@ -148,12 +148,13 @@
+ resmgr_conffile_usr=kolab
+ resmgr_conffile_grp=root
+ #resmgr_tmpdir=
++resmgr_locksdir=${kolab_statedir}/filter/locks
++resmgr_localedir=${libdir}/usr/share/php/data/Kolab_Filter/locale
+ resmgr_scriptsdir=${bindir}
+ resmgr_usr=root
  resmgr_grp=www-data
- resmgr_filterdir=${kolab_statedir}/resmgr/filter
+-resmgr_filterdir=${kolab_statedir}/resmgr/filter
  resmgr_log_type=syslog
 -resmgr_log_name=cons, pid
 +resmgr_log_name='cons,pid'
  
  fbview_logfile=${localstatedir}/log/fbview.log
  freebusy_logdir=${localstatedir}/log
-@@ -162,7 +162,7 @@
+@@ -162,7 +163,7 @@
  freebusy_usr=root
  freebusy_grp=www-data
  freebusy_log_type=syslog

Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2009-03-17 12:13:37 UTC (rev 1237)
+++ kolabd/branches/2.2.1/debian/changelog	2009-03-17 21:35:21 UTC (rev 1238)
@@ -31,6 +31,7 @@
   * 10-dist_conf.diff is back (again):
     - corrected shell syntax error in dist_conf/debian
     - corrected sed regexp to allow comma in dist_conf/common
+    - added resmgr_locksdir and resmgr_localedir
   * 90-slapd.template.diff updated:
     - load module syncprov
     - don't install horde schema anymore as horde now use flat files for
@@ -51,7 +52,7 @@
     - build-depends on debhelper 7
     - replace 'dh_clean -k' by 'dh_prep'
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 17 Mar 2009 12:04:51 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 17 Mar 2009 22:29:19 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff	2009-03-17 12:13:37 UTC (rev 1237)
+++ kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff	2009-03-17 21:35:21 UTC (rev 1238)
@@ -8,16 +8,23 @@
 ===================================================================
 --- a/dist_conf/debian
 +++ b/dist_conf/debian
-@@ -153,7 +153,7 @@
+@@ -148,12 +148,13 @@
+ resmgr_conffile_usr=kolab
+ resmgr_conffile_grp=root
+ #resmgr_tmpdir=
++resmgr_locksdir=${kolab_statedir}/filter/locks
++resmgr_localedir=${libdir}/usr/share/php/data/Kolab_Filter/locale
+ resmgr_scriptsdir=${bindir}
+ resmgr_usr=root
  resmgr_grp=www-data
- resmgr_filterdir=${kolab_statedir}/resmgr/filter
+-resmgr_filterdir=${kolab_statedir}/resmgr/filter
  resmgr_log_type=syslog
 -resmgr_log_name=cons, pid
 +resmgr_log_name='cons,pid'
  
  fbview_logfile=${localstatedir}/log/fbview.log
  freebusy_logdir=${localstatedir}/log
-@@ -162,7 +162,7 @@
+@@ -162,7 +163,7 @@
  freebusy_usr=root
  freebusy_grp=www-data
  freebusy_log_type=syslog