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

Steffen Joeris white-guest at costa.debian.org
Wed Feb 1 23:01:39 UTC 2006


Author: white-guest
Date: 2006-02-01 23:01:38 +0000 (Wed, 01 Feb 2006)
New Revision: 276

Added:
   trunk/kolab-webadmin/debian/patches/
   trunk/kolab-webadmin/debian/patches/00list
   trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch
Modified:
   trunk/kolab-webadmin/debian/control
   trunk/kolab-webadmin/debian/rules
Log:
* wrote patch for requires
* add dpatch stuff


Modified: trunk/kolab-webadmin/debian/control
===================================================================
--- trunk/kolab-webadmin/debian/control	2006-02-01 21:57:46 UTC (rev 275)
+++ trunk/kolab-webadmin/debian/control	2006-02-01 23:01:38 UTC (rev 276)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
-Build-Depends-Indep: debhelper (>= 4.0.0), autotools-dev
+Build-Depends-Indep: debhelper (>= 4.0.0), autotools-dev, dpatch
 Standards-Version: 3.6.2
 
 Package: kolab-webadmin
 Architecture: all
-Depends: php4, smarty, php-net-sieve
+Depends: php4, smarty
 Description: web-interface for kolab administration
  Kolab is a secure, scalable and reliable groupware server. It is
  formed by a number of well-known and proven components or the

Added: trunk/kolab-webadmin/debian/patches/00list
===================================================================
--- trunk/kolab-webadmin/debian/patches/00list	2006-02-01 21:57:46 UTC (rev 275)
+++ trunk/kolab-webadmin/debian/patches/00list	2006-02-01 23:01:38 UTC (rev 276)
@@ -0,0 +1 @@
+10-fix-require

Added: trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch	2006-02-01 21:57:46 UTC (rev 275)
+++ trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch	2006-02-01 23:01:38 UTC (rev 276)
@@ -0,0 +1,649 @@
+#!/bin/sh -e
+## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correction of the require pathes
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+      -patch) patch $patch_opts -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- index.php.orig	2006-02-01 22:53:18.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/index.php	2006-02-01 22:54:10.000000000 +0100
+@@ -18,14 +18,14 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ function exists_group( $group ) {
+   global $ldap;
+--- deliver.php.orig	2006-02-01 22:55:41.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/user/deliver.php	2006-02-01 22:59:09.000000000 +0100
+@@ -18,10 +18,10 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once 'admin/include/mysmarty.php';
+-require_once 'admin/include/headers.php';
+-require_once 'admin/include/authenticate.php';
+-require_once 'admin/include/sieveutils.class.php';
++require_once '/usr/share/kolab-webadmin/admin/include/mysmarty.php';
++require_once '/usr/share/kolab-webadmin/admin/include/headers.php';
++require_once '/usr/share/kolab-webadmin/admin/include/authenticate.php';
++require_once '/usr/share/kolab-webadmin/admin/include/sieveutils.class.php';
+ 
+ // Funny multiline string escaping in Sieve
+ function dotstuff( $str ) {
+@@ -33,7 +33,7 @@
+ }
+ 
+ $errors = array();
+-if( (@include_once 'admin/include/Sieve.php' ) === false ) {
++if( (@include_once '/usr/share/kolab-webadmin/admin/include/Sieve.php' ) === false ) {
+   $errors[] = _('Net/Sieve.php is missing. Without that, filter settings are not available');
+   $errors[] = _("Suggest your system administrator to run \"$kolab_prefix/bin/pear install http://pear.php.net/get/Net_Sieve\" on the server");
+ }
+@@ -41,7 +41,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'user';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- vacation.php.orig	2006-02-01 23:03:49.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/user/vacation.php	2006-02-01 23:06:15.000000000 +0100
+@@ -6,14 +6,14 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once 'admin/include/mysmarty.php';
+-require_once 'admin/include/headers.php';
+-require_once('admin/include/locale.php');
+-require_once 'admin/include/authenticate.php';
+-require_once 'admin/include/sieveutils.class.php';
++require_once '/usr/share/kolab-webadmin/admin/include/mysmarty.php';
++require_once '/usr/share/kolab-webadmin/admin/include/headers.php';
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once '/usr/share/kolab-webadmin/admin/include/authenticate.php';
++require_once '/usr/share/kolab-webadmin/admin/include/sieveutils.class.php';
+ 
+ $errors = array();
+-if( (@include_once 'admin/include/Sieve.php' ) === false ) {
++if( (@include_once '/usr/share/kolab-webadmin/admin/include/Sieve.php' ) === false ) {
+   $errors[] = _('Net/Sieve.php is missing. Without that, vacation settings are not available');
+   $errors[] = _("Suggest your system administrator to run \"$kolab_prefix/bin/pear install http://pear.php.net/get/Net_Sieve\" on the server");
+ }
+@@ -21,7 +21,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'user';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- user.php.orig	2006-02-01 23:10:28.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/user/user.php	2006-02-01 23:11:25.000000000 +0100
+@@ -6,11 +6,11 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ /**** Functions ***/
+ function comment( $s ) {
+@@ -314,7 +314,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'user';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ $menuitems[$sidx]['selected'] = 'selected';
+ 
+ /**** Logic ***/
+--- index.php.orig	2006-02-01 23:12:20.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/user/index.php	2006-02-01 23:13:23.000000000 +0100
+@@ -19,10 +19,10 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -33,7 +33,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- forward.php.orig	2006-02-01 23:16:05.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/user/forward.php	2006-02-01 23:17:03.000000000 +0100
+@@ -18,11 +18,11 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once 'admin/include/mysmarty.php';
+-require_once 'admin/include/headers.php';
+-require_once('admin/include/locale.php');
+-require_once 'admin/include/authenticate.php';
+-require_once 'admin/include/sieveutils.class.php';
++require_once '/usr/share/kolab-webadmin/admin/include/mysmarty.php';
++require_once '/usr/share/kolab-webadmin/admin/include/headers.php';
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once '/usr/share/kolab-webadmin/admin/include/authenticate.php';
++require_once '/usr/share/kolab-webadmin/admin/include/sieveutils.class.php';
+ 
+ // Funny multiline string escaping in Sieve
+ function dotstuff( $str ) {
+@@ -42,7 +42,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'user';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- index.php.orig	2006-02-01 23:19:35.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/sharedfolder/index.php	2006-02-01 23:20:19.000000000 +0100
+@@ -7,10 +7,10 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -21,7 +21,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- sf.php.orig	2006-02-01 23:23:06.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/sharedfolder/sf.php	2006-02-01 23:25:15.000000000 +0100
+@@ -7,11 +7,11 @@
+  * Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ /**** Authentication etc. ***/
+ $errors = array();
+@@ -24,7 +24,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ function fill_form_for_modify( &$form, &$ldap_object ) {
+   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
+--- index.php.orig	2006-02-01 23:28:12.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/service/index.php	2006-02-01 23:29:03.000000000 +0100
+@@ -1,8 +1,8 @@
+ <?php
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -13,7 +13,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- index.php.orig	2006-02-01 23:30:39.000000000 +0100
++++ kolab-webadmin-0-4.0/www/admin/maintainer/index.php	2006-02-01 23:31:23.000000000 +0100
+@@ -18,10 +18,10 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -32,7 +32,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- maintainer.php.orig	2006-02-01 23:32:28.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/maintainer/maintainer.php	2006-02-01 23:33:21.000000000 +0100
+@@ -18,11 +18,11 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ /**** Functions ***/
+ function comment( $s ) {
+@@ -122,7 +122,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'maintainer';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ $menuitems[$sidx]['selected'] = 'selected';
+ 
+ /**** Logic ***/
+--- kde.php.orig	2006-02-01 23:34:43.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/kde.php	2006-02-01 23:35:28.000000000 +0100
+@@ -7,15 +7,15 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- kdab.php.orig	2006-02-01 23:36:30.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/kdab.php	2006-02-01 23:37:15.000000000 +0100
+@@ -7,15 +7,15 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- codefusion.php.orig	2006-02-01 23:38:00.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/codefusion.php	2006-02-01 23:38:42.000000000 +0100
+@@ -21,15 +21,15 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- erfrakon.php.orig	2006-02-01 23:39:20.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/erfrakon.php	2006-02-01 23:39:59.000000000 +0100
+@@ -20,15 +20,15 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- intevation.php.orig	2006-02-01 23:41:04.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/intevation.php	2006-02-01 23:41:44.000000000 +0100
+@@ -7,15 +7,15 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- versions.php.orig	2006-02-01 23:42:28.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/versions.php	2006-02-01 23:43:15.000000000 +0100
+@@ -7,15 +7,15 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- index.php.orig	2006-02-01 23:44:25.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/kolab/index.php	2006-02-01 23:45:13.000000000 +0100
+@@ -7,15 +7,15 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ /**** Authentication etc. ***/
+ $sidx = 'about';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ 
+ /**** Submenu for current page ***/
+--- index.php.orig	2006-02-01 23:46:18.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/distributionlist/index.php	2006-02-01 23:47:07.000000000 +0100
+@@ -20,10 +20,10 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -34,7 +34,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- list.php.orig	2006-02-01 23:47:52.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/distributionlist/list.php	2006-02-01 23:48:42.000000000 +0100
+@@ -18,11 +18,11 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ 
+ /**** Authentication etc. ***/
+@@ -36,7 +36,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ function checkemaillist( $form, $key, $value ) {
+   global $ldap;
+--- index.php.orig	2006-02-01 23:49:39.000000000 +0100
++++ kolab-webadmin-0.4.0//www/admin/administrator/index.php	2006-02-01 23:50:21.000000000 +0100
+@@ -18,10 +18,10 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -32,7 +32,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- admin.php.orig	2006-02-01 23:51:41.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/administrator/admin.php	2006-02-01 23:52:30.000000000 +0100
+@@ -18,11 +18,11 @@
+  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+  */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ /**** Functions ***/
+ function comment( $s ) {
+@@ -129,7 +129,7 @@
+ /**** Authentication etc. ***/
+ $sidx = 'administrator';
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ $menuitems[$sidx]['selected'] = 'selected';
+ 
+ /**** Logic ***/
+--- index.php.orig	2006-02-01 23:53:37.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/addressbook/index.php	2006-02-01 23:54:26.000000000 +0100
+@@ -7,10 +7,10 @@
+  Read the file COPYING that comes with this packages for details.
+ */
+ 
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
+ 
+ $errors = array();
+ 
+@@ -21,7 +21,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ /**** Submenu for current page ***/
+ $menuitems[$sidx]['selected'] = 'selected';
+--- addr.php.orig	2006-02-01 23:55:18.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/addressbook/addr.php	2006-02-01 23:56:06.000000000 +0100
+@@ -1,9 +1,9 @@
+ <?php
+-require_once('admin/include/mysmarty.php');
+-require_once('admin/include/headers.php');
+-require_once('admin/include/locale.php');
+-require_once('admin/include/authenticate.php');
+-require_once('admin/include/form.class.php');
++require_once('/usr/share/kolab-webadmin/admin/include/mysmarty.php');
++require_once('/usr/share/kolab-webadmin/admin/include/headers.php');
++require_once('/usr/share/kolab-webadmin/admin/include/locale.php');
++require_once('/usr/share/kolab-webadmin/admin/include/authenticate.php');
++require_once('/usr/share/kolab-webadmin/admin/include/form.class.php');
+ 
+ 
+ /**** Authentication etc. ***/
+@@ -17,7 +17,7 @@
+    array_push($errors, _("Error: You don't have Permissions to access this Menu") );
+ }
+ 
+-require_once('admin/include/menu.php');
++require_once('/usr/share/kolab-webadmin/admin/include/menu.php');
+ 
+ function fill_form_for_modify( &$form, &$ldap_object ) {
+   if (is_array($ldap_object['sn'])) $lastname = $ldap_object['sn'][0];


Property changes on: trunk/kolab-webadmin/debian/patches/10-fix-require.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/kolab-webadmin/debian/rules
===================================================================
--- trunk/kolab-webadmin/debian/rules	2006-02-01 21:57:46 UTC (rev 275)
+++ trunk/kolab-webadmin/debian/rules	2006-02-01 23:01:38 UTC (rev 276)
@@ -5,6 +5,8 @@
 
 config.status: configure
 	dh_testdir
+	dpatch apply-all
+	touch patch-stamp
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
@@ -25,7 +27,10 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
+	dpatch deapply-all
+	rm -rf debian/patched
+	rm -f patch-stamp
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -44,6 +49,7 @@
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
+	install -D -m 644 debian/apache.conf $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/apache.conf
 
 
 # Build architecture-independent files here.




More information about the pkg-kolab-devel mailing list