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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-20 13:26:59 +0000 (Sat, 20 Dec 2008)
New Revision: 1085

Added:
   kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/series
Log:
10-dist_conf is back


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-17 16:21:59 UTC (rev 1084)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-20 13:26:59 UTC (rev 1085)
@@ -28,8 +28,9 @@
     - apache.conf
     - prerm and postinst scripts
     - freebusy cache directory 
+  * 10-dist_conf.diff is back for graveyard path
 
- -- Mathieu Parent <math.parent at gmail.com>  Wed, 17 Dec 2008 17:19:24 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 20 Dec 2008 14:22:08 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Added: kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff	                        (rev 0)
+++ kolabd/branches/2.2.1/debian/patches/10-dist_conf.diff	2008-12-20 13:26:59 UTC (rev 1085)
@@ -0,0 +1,33 @@
+Goal: Correct dist_conf/debian
+
+Author: Mathieu Parent <math.parent at gmail.com>
+
+Upstream status: Can be commited upstream
+
+Index: b/dist_conf/debian
+===================================================================
+--- a/dist_conf/debian
++++ b/dist_conf/debian
+@@ -146,17 +146,17 @@
+ resmgr_scriptsdir=/usr/share/kolab/filter
+ resmgr_usr=root
+ resmgr_grp=www-data
+-resmgr_filterdir=${localstatedir}/lib/kolab/resmgr/filter
++resmgr_filterdir=${kolab_statedir}/resmgr/filter
+ 
+-fbview_logfile=${localstatedir}/resmgr/fbview.log
++fbview_logfile=${localstatedir}/log/fbview.log
+ freebusy_logdir=${localstatedir}/log
+ freebusy_confdir=${sysconfdir}/kolab/freebusy
+-freebusy_cachedir=${localstatedir}/lib/kolab/freebusy-cache
++freebusy_cachedir=${kolab_statedir}/freebusy-cache
+ freebusy_usr=root
+ freebusy_grp=www-data
+ 
+-graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
+-graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db
++graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
++graveyard_tscache=${kolab_statedir}/graveyard_tscache.db
+ 
+ backupdir=${localstatedir}/backups/kolab
+ 

Modified: kolabd/branches/2.2.1/debian/patches/series
===================================================================
--- kolabd/branches/2.2.1/debian/patches/series	2008-12-17 16:21:59 UTC (rev 1084)
+++ kolabd/branches/2.2.1/debian/patches/series	2008-12-20 13:26:59 UTC (rev 1085)
@@ -1,3 +1,4 @@
+10-dist_conf.diff
 55-no-distconf_kolabsrv.diff 
 70-kolab2.schema-removal.of.rfc2739.diff 
 90-slapd-template.diff