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

[petere at alioth.debian.org]

Author: petere
Date: 2007-05-29 11:52:44 +0000 (Tue, 29 May 2007)
New Revision: 587

Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
Log:
* Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
  config.php (closes: #424460)

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2007-05-29 11:24:54 UTC (rev 586)
+++ kolab-webadmin/trunk/debian/changelog	2007-05-29 11:52:44 UTC (rev 587)
@@ -1,3 +1,10 @@
+kolab-webadmin (0.4.0-20060810-5) UNRELEASED; urgency=low
+
+  * Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
+    config.php (closes: #424460)
+
+ -- Peter Eisentraut <petere at debian.org>  Tue, 29 May 2007 13:51:37 +0200
+
 kolab-webadmin (0.4.0-20060810-4) unstable; urgency=medium
 
   * Install the apache.conf file into the kolab directory to make sure

Modified: kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch	2007-05-29 11:24:54 UTC (rev 586)
+++ kolab-webadmin/trunk/debian/patches/40-kolab_prefix.dpatch	2007-05-29 11:52:44 UTC (rev 587)
@@ -4,15 +4,15 @@
 ## DP: correct path of res_pub.pem (bug #361000)
 
 @DPATCH@
-diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php kolab-webadmin-0.4.0-20060810/php/admin/include/config.php
---- kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php	2006-08-10 20:18:30.000000000 +0200
-+++ kolab-webadmin-0.4.0-20060810/php/admin/include/config.php	2006-08-21 19:24:36.000000000 +0200
+diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php.in kolab-webadmin-0.4.0-20060810/php/admin/include/config.php.in
+--- kolab-webadmin-0.4.0-20060810~/php/admin/include/config.php.in	2006-08-10 20:18:30.000000000 +0200
++++ kolab-webadmin-0.4.0-20060810/php/admin/include/config.php.in	2006-08-21 19:24:36.000000000 +0200
 @@ -19,7 +19,7 @@
   */
  
  $topdir = '/admin';
--$kolab_prefix = '/kolab';
+-$kolab_prefix = '@prefix@';
 +$kolab_prefix = '';
- $php_dir      = '/kolab/var/kolab/php';
+ $php_dir      = '@phpdir@';
  $locale_dir   = "$php_dir/admin/locale/";