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

Peter Eisentraut petere at costa.debian.org
Wed Oct 25 19:24:57 UTC 2006 

Author: petere
Date: 2006-10-25 19:24:56 +0000 (Wed, 25 Oct 2006)
New Revision: 477

Added:
   kolab-webadmin/trunk/debian/README.Debian
   kolab-webadmin/trunk/debian/apache.conf
Modified:
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
   kolab-webadmin/trunk/debian/rules
Log:
* Added Apache configuration file (closes: #376661)
* Put PHP include path into Apache configuration (closes: #392354);
  obsoletes large parts of 10-fix-require.dpatch

Added: kolab-webadmin/trunk/debian/README.Debian
===================================================================
--- kolab-webadmin/trunk/debian/README.Debian	                        (rev 0)
+++ kolab-webadmin/trunk/debian/README.Debian	2006-10-25 19:24:56 UTC (rev 477)
@@ -0,0 +1,20 @@
+First, set up /etc/kolab-webadmin/session_vars.php.
+
+Then, to activate the web site, in order of preference,
+
+(a) If you have kolab-resource-handlers installed, include
+    /etc/kolab-webadmin/apache.conf into that package's (SSL-enabled)
+    Apache configuration.
+
+- or -
+
+(b) Set up an SSL virtual host and include
+    /etc/kolab-webadmin/apache.conf there.
+
+- or -
+
+(c) Symlink /etc/kolab-webadmin/apache.conf to
+    /etc/apache2/conf.d/kolab-webadmin.  (This is obviously insecure,
+    but good enough for testing.)
+
+Reload Apache afterwards in any case.

Added: kolab-webadmin/trunk/debian/apache.conf
===================================================================
--- kolab-webadmin/trunk/debian/apache.conf	                        (rev 0)
+++ kolab-webadmin/trunk/debian/apache.conf	2006-10-25 19:24:56 UTC (rev 477)
@@ -0,0 +1,13 @@
+# Apache and PHP configuration for Kolab Webadmin
+#
+# Read /usr/share/doc/kolab-webadmin/README.Debian about setting up this
+# web site.
+
+Alias /admin /usr/share/kolab-webadmin/admin
+
+<Directory /usr/share/kolab-webadmin/admin>
+    Options Indexes FollowSymLinks
+    Order allow,deny
+    Allow from all
+    php_value include_path /usr/share/kolab-webadmin:.:/usr/share/php
+</Directory>

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2006-10-25 18:06:16 UTC (rev 476)
+++ kolab-webadmin/trunk/debian/changelog	2006-10-25 19:24:56 UTC (rev 477)
@@ -1,7 +1,10 @@
-kolab-webadmin (0.4.0-20060810-2) UNRELEASED; urgency=low
+kolab-webadmin (0.4.0-20060810-2) UNRELEASED; urgency=medium
 
   * Restricted permissions on configuration files containing passwords
   * Added XS-X-Vcs-Svn field
+  * Added Apache configuration file (closes: #376661)
+  * Put PHP include path into Apache configuration (closes: #392354);
+    obsoletes large parts of 10-fix-require.dpatch
 
  -- Peter Eisentraut <petere at debian.org>  Mon, 25 Sep 2006 13:10:27 +0200
 

Modified: kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch
===================================================================
--- kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2006-10-25 18:06:16 UTC (rev 476)
+++ kolab-webadmin/trunk/debian/patches/10-fix-require.dpatch	2006-10-25 19:24:56 UTC (rev 477)
@@ -1,635 +1,24 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 10-fix-requrires.dpatch by Steffen Joeris <steffen.joeris at skolelinux.de>
 ##
-## DP: Correction of the require pathes
+## DP: Correction of the require paths
 
 @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>.
+diff -urNad kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php
+--- kolab-webadmin-0.4.0-20060810~/php/admin/include/ldap.class.php	2006-08-10 20:18:16.000000000 +0200
++++ kolab-webadmin-0.4.0-20060810/php/admin/include/ldap.class.php	2006-10-25 20:28:23.000000000 +0200
+@@ -19,7 +19,7 @@
   */
  
--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');
+ require_once('mysmarty.php');
+-require_once('session_vars.php');
++require_once('/etc/kolab-webadmin/session_vars.php');
+ require_once('debug.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];
---- mysmarty.php.orig	2006-02-08 16:42:09.000000000 +0100
-+++ kolab-webadmin-0.4.0/php/admin/include/mysmarty.php	2006-02-08 16:43:33.000000000 +0100
+ /* We dont have any better place to put this right now... */
+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	2006-08-10 20:18:16.000000000 +0200
++++ kolab-webadmin-0.4.0-20060810/php/admin/include/mysmarty.php	2006-10-25 20:28:23.000000000 +0200
 @@ -19,7 +19,7 @@
   */
  
@@ -648,14 +37,3 @@
  	$this->config_dir = $basedir.'configs/';
  	//$this->cache_dir = $basedir.'cache/';
  	// Added for i18n management (Romain 05-03-03)
---- ldap.class.php.orig	2006-02-08 17:07:04.000000000 +0100
-+++ kolab-webadmin-0.4.0/php/admin/include/ldap.class.php	2006-02-08 17:07:15.000000000 +0100
-@@ -19,7 +19,7 @@
-  */
- 
- require_once('mysmarty.php');
--require_once('session_vars.php');
-+require_once('/etc/kolab-webadmin/session_vars.php');
- require_once('debug.php');
- 
- /* We dont have any better place to put this right now... */

Modified: kolab-webadmin/trunk/debian/rules
===================================================================
--- kolab-webadmin/trunk/debian/rules	2006-10-25 18:06:16 UTC (rev 476)
+++ kolab-webadmin/trunk/debian/rules	2006-10-25 19:24:56 UTC (rev 477)
@@ -36,6 +36,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
 	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
 	install -D -m 644 debian/distdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/distdeleted.tpl
 	install -D -m 644 debian/sfdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/sfdeleted.tpl

More information about the pkg-kolab-devel mailing list