[pkg-kolab] r1577 - in kolab-webadmin/trunk/debian: . patches

[Mathieu Parent]

Author: sathieu
Date: 2011-11-20 15:26:42 +0000 (Sun, 20 Nov 2011)
New Revision: 1577

Added:
   kolab-webadmin/trunk/debian/patches/10-template.diff
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/series
Log:
new 10-template.diff: fix template target

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2011-11-20 15:21:11 UTC (rev 1576)
+++ kolab-webadmin/trunk/debian/changelog	2011-11-20 15:26:42 UTC (rev 1577)
@@ -20,6 +20,7 @@
     - config.php synced with upstream
     - install config.php template (Closes: #598665), coming from a new source
       package (d/uupdate-wrapper updated)
+    - new 10-template.diff: fix template target
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 06 Apr 2011 19:23:56 +0200
 

Added: kolab-webadmin/trunk/debian/patches/10-template.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-template.diff	                        (rev 0)
+++ kolab-webadmin/trunk/debian/patches/10-template.diff	2011-11-20 15:26:42 UTC (rev 1577)
@@ -0,0 +1,13 @@
+Description: Fix template target
+
+Index: kolab-webadmin-2.3.4-20110927/templates/webadmin.conf.template
+===================================================================
+--- kolab-webadmin-2.3.4-20110927.orig/templates/webadmin.conf.template	2011-11-20 15:31:32.000000000 +0100
++++ kolab-webadmin-2.3.4-20110927/templates/webadmin.conf.template	2011-11-20 16:24:19.000000000 +0100
+@@ -1,5 +1,5 @@
+ KOLAB_META_START
+-TARGET=@@@phplibdir@@@/KolabAdmin/include/config.php
++TARGET=/etc/kolab/webadmin/config.php
+ PERMISSIONS=0640
+ OWNERSHIP=@@@webserver_musr@@@:@@@webserver_grp@@@
+ KOLAB_META_END

Modified: kolab-webadmin/trunk/debian/patches/series
===================================================================
--- kolab-webadmin/trunk/debian/patches/series	2011-11-20 15:21:11 UTC (rev 1576)
+++ kolab-webadmin/trunk/debian/patches/series	2011-11-20 15:26:42 UTC (rev 1577)
@@ -1 +1,2 @@
+10-template.diff
 71-sieve-port-number.diff