[pkg-kolab] r772 - kolab-webadmin/branches/2.2/debian/patches/common kolabd/branches/2.2/debian/patches/common

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-03-17 20:02:43 +0000 (Mon, 17 Mar 2008)
New Revision: 772

Modified:
   kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
   kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
Log:
Updated dist_conf patches to include kolab_wui=/admin


Modified: kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-17 19:24:51 UTC (rev 771)
+++ kolab-webadmin/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-17 20:02:43 UTC (rev 772)
@@ -4,9 +4,9 @@
 ## DP: Adjusts some paths
 
 @DPATCH@
-diff -urNad kolabd-2.1.99+20080314.dfsg~/dist_conf/debian kolabd-2.1.99+20080314.dfsg/dist_conf/debian
---- kolabd-2.1.99+20080314.dfsg~/dist_conf/debian	2008-02-26 14:58:04.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/dist_conf/debian	2008-03-17 19:27:44.000000000 +0100
+diff -urNad kolab-webadmin-2.1.99+20080314~/dist_conf/debian kolab-webadmin-2.1.99+20080314/dist_conf/debian
+--- kolab-webadmin-2.1.99+20080314~/dist_conf/debian	2008-02-26 14:58:04.000000000 +0100
++++ kolab-webadmin-2.1.99+20080314/dist_conf/debian	2008-03-17 20:38:51.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -53,7 +53,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,26 +54,29 @@
+@@ -53,45 +54,48 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -89,7 +89,8 @@
  kolab_php_smarty_prefix=smarty/libs
  
  # Kolab web user interface
-@@ -80,18 +84,18 @@
+-kolab_wui=/kolab/admin
++kolab_wui=/admin
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap

Modified: kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-17 19:24:51 UTC (rev 771)
+++ kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-17 20:02:43 UTC (rev 772)
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad kolabd-2.1.99+20080314.dfsg~/dist_conf/debian kolabd-2.1.99+20080314.dfsg/dist_conf/debian
 --- kolabd-2.1.99+20080314.dfsg~/dist_conf/debian	2008-02-26 14:58:04.000000000 +0100
-+++ kolabd-2.1.99+20080314.dfsg/dist_conf/debian	2008-03-17 19:27:44.000000000 +0100
++++ kolabd-2.1.99+20080314.dfsg/dist_conf/debian	2008-03-17 21:00:43.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -53,7 +53,7 @@
  
  clamav_confdir=${sysconfdir}/clamav
  clamav_socket=${localstatedir}/clamav/clamd.sock
-@@ -53,26 +54,29 @@
+@@ -53,45 +54,48 @@
  emailserver_socket=${libdir}/postfix/lmtp
  emailserver_localstatedir=${localstatedir}/spool/postfix
  emailserver_logfile=${localstatedir}/log/mail.log
@@ -89,7 +89,8 @@
  kolab_php_smarty_prefix=smarty/libs
  
  # Kolab web user interface
-@@ -80,18 +84,18 @@
+-kolab_wui=/kolab/admin
++kolab_wui=/admin
  
  ldapserver_statedir=${localstatedir}/lib/ldap
  ldapserver_dir=${localstatedir}/lib/ldap