gunnar: server/kolabd/kolabd/dist_conf common, 1.53.2.1, 1.53.2.2 kolab, 1.70.2.1, 1.70.2.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv28309/kolabd/kolabd/dist_conf

Modified Files:
      Tag: kolab_2_2_branch
	common kolab 
Log Message:
Merge configuration for kolab/issue2499 from HEAD

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -d -r1.53.2.1 -r1.53.2.2
--- common	26 Mar 2009 21:29:45 -0000	1.53.2.1
+++ common	10 Nov 2009 20:42:00 -0000	1.53.2.2
@@ -120,6 +120,7 @@
 	-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_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' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.70.2.1
retrieving revision 1.70.2.2
diff -u -d -r1.70.2.1 -r1.70.2.2
--- kolab	26 Mar 2009 21:29:45 -0000	1.70.2.1
+++ kolab	10 Nov 2009 20:42:00 -0000	1.70.2.2
@@ -175,6 +175,7 @@
 resmgr_conffile_usr=${kolab_musr}
 resmgr_conffile_grp=${kolab_grp}
 resmgr_tmpdir=${localstatedir}/kolab-filter/tmp
+resmgr_localedir=${libdir}/php/data/Kolab_Filter/locale
 resmgr_scriptsdir=${bindir}
 # @l_musr@
 resmgr_usr=${kolab_musr}