[pkg-kolab] r683 - kolab-resource-handlers/trunk/debian

petere at alioth.debian.org petere at alioth.debian.org
Thu Aug 9 09:17:55 UTC 2007


Author: petere
Date: 2007-08-09 09:17:55 +0000 (Thu, 09 Aug 2007)
New Revision: 683

Modified:
   kolab-resource-handlers/trunk/debian/changelog
   kolab-resource-handlers/trunk/debian/control
   kolab-resource-handlers/trunk/debian/postinst
Log:
* Added php5 dependency alternatives (closes: #379122, #414038, #424793)
* Dropped obsolete php4-domxml dependency

Modified: kolab-resource-handlers/trunk/debian/changelog
===================================================================
--- kolab-resource-handlers/trunk/debian/changelog	2007-08-08 15:51:51 UTC (rev 682)
+++ kolab-resource-handlers/trunk/debian/changelog	2007-08-09 09:17:55 UTC (rev 683)
@@ -7,6 +7,8 @@
       70-IMAP.php.dpatch, 80-freebusycache.class.php-path.dpatch,
       90-freebusy.php-path.dpatch, 100-pfb.php-path.dpatch
   * Now using upstream freebusy.conf
+  * Added php5 dependency alternatives (closes: #379122, #414038, #424793)
+  * Dropped obsolete php4-domxml dependency
 
  -- Peter Eisentraut <petere at debian.org>  Wed, 01 Aug 2007 13:38:31 +0200
 

Modified: kolab-resource-handlers/trunk/debian/control
===================================================================
--- kolab-resource-handlers/trunk/debian/control	2007-08-08 15:51:51 UTC (rev 682)
+++ kolab-resource-handlers/trunk/debian/control	2007-08-09 09:17:55 UTC (rev 683)
@@ -10,7 +10,7 @@
 
 Package: kolab-resource-handlers
 Architecture: all
-Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php4, php4-ldap, php4-domxml, ssl-cert, php4-cli
+Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5 | libapache2-mod-php4, php5-ldap | php4-ldap, ssl-cert, php5-cli | php4-cli
 Description: Kolab free/busy scripts
  This package contains scripts for the free/busy feature of the Kolab
  groupware server.

Modified: kolab-resource-handlers/trunk/debian/postinst
===================================================================
--- kolab-resource-handlers/trunk/debian/postinst	2007-08-08 15:51:51 UTC (rev 682)
+++ kolab-resource-handlers/trunk/debian/postinst	2007-08-09 09:17:55 UTC (rev 683)
@@ -19,10 +19,16 @@
 }
 
 configure_apache() {
-	for mod in rewrite ssl php4 ldap; do
+	for mod in rewrite ssl ldap; do
 		a2enmod $mod >/dev/null
 	done
 
+	if [ -e /etc/apache2/mods-available/php5.load ]; then
+		a2enmod php5 >/dev/null
+	elif [ -e /etc/apache2/mods-available/php4.load ]; then
+		a2enmod php4 >/dev/null
+	fi
+
 	a2ensite kolab >/dev/null
 
 	if command -v invoke-rc.d >/dev/null 2>&1; then




More information about the pkg-kolab-devel mailing list