[pkg-kolab] r607 - kolab-webadmin/trunk/debian/patches

[petere at alioth.debian.org]

Author: petere
Date: 2007-06-18 15:01:58 +0000 (Mon, 18 Jun 2007)
New Revision: 607

Modified:
   kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
   kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch
Log:
Rearrange and simplify some patches

Modified: kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2007-06-18 01:21:38 UTC (rev 606)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2007-06-18 15:01:58 UTC (rev 607)
@@ -19,15 +19,6 @@
 diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php
 --- kolab-webadmin-0.4.0-20060810~/php/admin/include/mysmarty.php.in	2006-08-10 20:18:16.000000000 +0200
 +++ kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php.in	2006-10-25 20:28:23.000000000 +0200
-@@ -19,7 +19,7 @@
-  */
- 
- require_once('config.php');
--require_once('@kolab_php_smarty_prefix@/Smarty.class.php');
-+require_once('smarty/libs/Smarty.class.php');
- require_once('locale.php');
- 
- // PENDING: Remove this before production(!)
 @@ -36,7 +36,7 @@
  	
  	$basedir = "$php_dir/admin/";

Modified: kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch	2007-06-18 01:21:38 UTC (rev 606)
+++ kolab-webadmin/trunk/debian/patches/50-dist_conf.dpatch	2007-06-18 15:01:58 UTC (rev 607)
@@ -5,8 +5,17 @@
 
 @DPATCH@
 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	2007-06-18 01:53:54.000000000 +0200
-+++ kolab-webadmin-2.1.0-20070510/dist_conf/debian	2007-06-18 01:54:35.000000000 +0200
+--- kolab-webadmin-2.1.0-20070510~/dist_conf/debian	2006-03-09 22:52:02.000000000 +0100
++++ kolab-webadmin-2.1.0-20070510/dist_conf/debian	2007-06-18 16:44:40.000000000 +0200
+@@ -83,7 +83,7 @@
+ kolab_pidfile=${sysrundir}/kolab.pid
+ kolab_mailboxuiddb=${kolab_statedir}/mailbox-uidcache.db
+ kolab_scriptsdir=$(sysconfdir)/kolab
+-kolab_php_smarty_prefix=Smarty
++kolab_php_smarty_prefix=smarty/libs
+ 
+ ldapserver_statedir=${localstatedir}/lib/ldap
+ ldapserver_dir=${localstatedir}/lib/ldap
 @@ -98,7 +98,7 @@
  ldapserver_grp=ldap
  ldapserver_rusr=ldap