[pkg-kolab] r727 - common/patches

[petere at alioth.debian.org]

Author: petere
Date: 2008-02-22 16:35:42 +0000 (Fri, 22 Feb 2008)
New Revision: 727

Modified:
   common/patches/dist_conf.dpatch
Log:
Updated common patch for kolab_php_module_prefix


Modified: common/patches/dist_conf.dpatch
===================================================================
--- common/patches/dist_conf.dpatch	2008-02-22 16:34:32 UTC (rev 726)
+++ common/patches/dist_conf.dpatch	2008-02-22 16:35:42 UTC (rev 727)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolabd-2.1.0-20070510.dfsg~/dist_conf/debian kolabd-2.1.0-20070510.dfsg/dist_conf/debian
---- kolabd-2.1.0-20070510.dfsg~/dist_conf/debian	2007-12-12 23:41:50.000000000 +0100
-+++ kolabd-2.1.0-20070510.dfsg/dist_conf/debian	2007-12-12 23:45:14.000000000 +0100
+diff -urNad kolab-webadmin-2.1.0-20070510~/dist_conf/debian kolab-webadmin-2.1.0-20070510/dist_conf/debian
+--- kolab-webadmin-2.1.0-20070510~/dist_conf/debian	2008-02-22 17:21:05.000000000 +0100
++++ kolab-webadmin-2.1.0-20070510/dist_conf/debian	2008-02-22 17:22:20.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -67,7 +67,7 @@
  
  ftpserver_scoreboardfile=${localstatedir}/proftpd/score
  ftpserver_logfile=${localstatedir}/log/proftpd.log
-@@ -69,36 +72,37 @@
+@@ -69,36 +72,39 @@
  
  imap_confdir=${sysconfdir}
  imap_confperm=0640
@@ -91,6 +91,8 @@
 -kolab_php_smarty_prefix=Smarty
 +kolab_scriptsdir=${sbindir}
 +kolab_php_smarty_prefix=smarty/libs
++
++kolab_php_module_prefix=kolab/
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap
@@ -117,7 +119,7 @@
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -114,28 +118,39 @@
+@@ -114,28 +120,39 @@
  webserver_sslmutex=${sysrundir}/ssl_mutex
  webserver_web_prefix=/kolab
  webserver_musr=kolab