[pkg-kolab] r1261 - in kolabd/trunk/debian: . patches

[Mathieu Parent]

Author: mparent-guest
Date: 2009-04-09 00:49:14 +0000 (Thu, 09 Apr 2009)
New Revision: 1261

Modified:
   kolabd/trunk/debian/changelog
   kolabd/trunk/debian/patches/10-dist_conf.diff
Log:
* New upstream release (2.2.1-20090407)
  - 10-dist_conf.diff: partially integrated



Modified: kolabd/trunk/debian/changelog
===================================================================
--- kolabd/trunk/debian/changelog	2009-04-09 00:36:10 UTC (rev 1260)
+++ kolabd/trunk/debian/changelog	2009-04-09 00:49:14 UTC (rev 1261)
@@ -1,3 +1,10 @@
+kolabd (2.2.1-20090407-1) UNRELEASED; urgency=low
+
+  * New upstream release (2.2.1-20090407)
+    - 10-dist_conf.diff: partially integrated 
+
+ -- Mathieu Parent <math.parent at gmail.com>  Thu, 09 Apr 2009 02:44:33 +0200
+
 kolabd (2.2.1-20090304-1) experimental; urgency=low
 
   * New beta release 2.2.1-beta-1 (20081212)

Modified: kolabd/trunk/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/trunk/debian/patches/10-dist_conf.diff	2009-04-09 00:36:10 UTC (rev 1260)
+++ kolabd/trunk/debian/patches/10-dist_conf.diff	2009-04-09 00:49:14 UTC (rev 1261)
@@ -4,40 +4,11 @@
 
 Upstream status: Can be commited upstream
 
-Index: b/dist_conf/debian
-===================================================================
---- a/dist_conf/debian
-+++ b/dist_conf/debian
-@@ -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_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 +163,7 @@
- freebusy_usr=root
- freebusy_grp=www-data
- freebusy_log_type=syslog
--freebusy_log_name=cons, pid
-+freebusy_log_name='cons,pid'
- 
- graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
- graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
 Index: b/dist_conf/common
 ===================================================================
 --- a/dist_conf/common
 +++ b/dist_conf/common
-@@ -1,152 +1,152 @@
+@@ -1,159 +1,159 @@
  do_subst = sed \
 -	-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
 -	-e 's,[@]bindir[@],$(bindir),g' \
@@ -189,7 +160,14 @@
 -	-e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g' \
 -	-e 's,[@]horde_cookie_path[@],$(horde_cookie_path),g' \
 -	-e 's,[@]horde_confdir[@],$(horde_confdir),g' \
--	-e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g'
+-	-e 's,[@]dimp_confdir[@],$(dimp_confdir),g' \
+-	-e 's,[@]imp_confdir[@],$(imp_confdir),g' \
+-	-e 's,[@]ingo_confdir[@],$(ingo_confdir),g' \
+-	-e 's,[@]kronolith_confdir[@],$(kronolith_confdir),g' \
+-	-e 's,[@]mimp_confdir[@],$(mimp_confdir),g' \
+-	-e 's,[@]mnemo_confdir[@],$(mnemo_confdir),g' \
+-	-e 's,[@]nag_confdir[@],$(nag_confdir),g' \
+-	-e 's,[@]turba_confdir[@],$(turba_confdir),g'
 +	-e 's=[@]sysconfdir[@]=$(sysconfdir)=g' \
 +	-e 's=[@]bindir[@]=$(bindir)=g' \
 +	-e 's=[@]sbindir[@]=$(sbindir)=g' \
@@ -340,4 +318,11 @@
 +	-e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
 +	-e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
 +	-e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
-+	-e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g'
++	-e 's=[@]dimp_confdir[@]=$(dimp_confdir)=g' \
++	-e 's=[@]imp_confdir[@]=$(imp_confdir)=g' \
++	-e 's=[@]ingo_confdir[@]=$(ingo_confdir)=g' \
++	-e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g' \
++	-e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
++	-e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
++	-e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
++	-e 's=[@]turba_confdir[@]=$(turba_confdir)=g'