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

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-12-21 18:23:52 +0000 (Sun, 21 Dec 2008)
New Revision: 1097

Modified:
   kolabd/branches/2.2.1/debian/changelog
   kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff
Log:
freebusy config name is now kolabfilter.conf


Modified: kolabd/branches/2.2.1/debian/changelog
===================================================================
--- kolabd/branches/2.2.1/debian/changelog	2008-12-21 18:08:58 UTC (rev 1096)
+++ kolabd/branches/2.2.1/debian/changelog	2008-12-21 18:23:52 UTC (rev 1097)
@@ -12,7 +12,7 @@
   * Moved patch: 40-disable-amavis to libkolab-perl 
   * Updated patch: 55-no-distconf_kolabsrv
   * 90-slapd.template.diff: load module syncprov
-  * 92-resmgr-template.diff: freebusy config path has changed
+  * 92-resmgr-template.diff: freebusy config name is now kolabfilter.conf
   * debian/rules
     - several perl script are now in libkolab-perl
     - kolab.conf removed (kolab/issue2994)
@@ -34,7 +34,7 @@
       /var/lib/backups/kolab
     - kolabfilter is now in /usr/bin/
 
- -- Mathieu Parent <math.parent at gmail.com>  Sun, 21 Dec 2008 19:05:57 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Sun, 21 Dec 2008 19:20:51 +0100
 
 kolabd (2.2.0-20080709.dfsg-3) UNRELEASED; urgency=low
 

Modified: kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff
===================================================================
--- kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff	2008-12-21 18:08:58 UTC (rev 1096)
+++ kolabd/branches/2.2.1/debian/patches/92-resmgr-template.diff	2008-12-21 18:23:52 UTC (rev 1097)
@@ -8,13 +8,6 @@
 ===================================================================
 --- a/templates/resmgr.conf.template.in
 +++ b/templates/resmgr.conf.template.in
-@@ -1,5 +1,5 @@
- KOLAB_META_START
--TARGET=@resmgr_confdir@/kolabfilter.conf
-+TARGET=/etc/kolab/filter/config.php
- PERMISSIONS=0640
- OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
- KOLAB_META_END
 @@ -166,8 +166,8 @@
   */
  $conf['log']['enabled']          = true;