[pkg-kolab] r838 - in kolabd/branches/2.2/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-05-05 19:17:22 +0000 (Mon, 05 May 2008)
New Revision: 838

Modified:
   kolabd/branches/2.2/debian/changelog
   kolabd/branches/2.2/debian/dirs
   kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch
   kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch
Log:
* /etc/kolab/{filter,freebusy}/config.php to preserve basename
* updated debian/dirs accordingly


Modified: kolabd/branches/2.2/debian/changelog
===================================================================
--- kolabd/branches/2.2/debian/changelog	2008-05-02 10:36:05 UTC (rev 837)
+++ kolabd/branches/2.2/debian/changelog	2008-05-05 19:17:22 UTC (rev 838)
@@ -19,10 +19,11 @@
   * new patch 86-slapd-syncrepl-24, to enable syncrepl and disable slurpd
     (Closes: #463791)
   * updated patch 91-postfix-template, partially applied upstream
-  * updated patch 92-resmgr-template, path is now /etc/kolab/filter_config.php
-    and format has changed
+  * updated patch 92-resmgr-template, path is now /etc/kolab/filter/config.php
+    and format has changed (updated debian/dirs accordingly)
   * updated patch 93-freebusy-template, path is now
-    /etc/kolab/freebusy_config.php and format has changed
+    /etc/kolab/freebusy/config.php and format has changed (updated debian/dirs
+    accordingly)
   * Add 91-workaround-bts-471253.dpatch
   * Re-add rfc2739 schema with a copyright notice: see
     http://lists.debian.org/debian-legal/2008/04/msg00087.html

Modified: kolabd/branches/2.2/debian/dirs
===================================================================
--- kolabd/branches/2.2/debian/dirs	2008-05-02 10:36:05 UTC (rev 837)
+++ kolabd/branches/2.2/debian/dirs	2008-05-05 19:17:22 UTC (rev 838)
@@ -1 +1,3 @@
 var/lib/kolab
+etc/kolab/filter
+etc/kolab/freebusy

Modified: kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch	2008-05-02 10:36:05 UTC (rev 837)
+++ kolabd/branches/2.2/debian/patches/92-resmgr-template.dpatch	2008-05-05 19:17:22 UTC (rev 838)
@@ -10,7 +10,7 @@
 @@ -1,5 +1,5 @@
  KOLAB_META_START
 -TARGET=@resmgr_confdir@/config.php
-+TARGET=/etc/kolab/filter_config.php
++TARGET=/etc/kolab/filter/config.php
  PERMISSIONS=0640
  OWNERSHIP=@resmgr_conffile_usr@:@resmgr_conffile_grp@
  KOLAB_META_END

Modified: kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch	2008-05-02 10:36:05 UTC (rev 837)
+++ kolabd/branches/2.2/debian/patches/93-freebusy-template.dpatch	2008-05-05 19:17:22 UTC (rev 838)
@@ -10,7 +10,7 @@
 @@ -1,5 +1,5 @@
  KOLAB_META_START
 -TARGET=@freebusy_confdir@/config.php
-+TARGET=/etc/kolab/freebusy_config.php
++TARGET=/etc/kolab/freebusy/config.php
  PERMISSIONS=0640
  OWNERSHIP=@freebusy_usr@:@freebusy_grp@
  KOLAB_META_END