[pkg-kolab] r1468 - kolab-webclient/trunk/debian

[Mathieu Parent]

Author: sathieu
Date: 2010-01-04 13:20:17 +0000 (Mon, 04 Jan 2010)
New Revision: 1468

Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/control
   kolab-webclient/trunk/debian/kolab-webclient.postinst
Log:
- Depends on php-net-ldap2
- Enable php5 and ssl apache modules during postinst


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2010-01-04 10:58:03 UTC (rev 1467)
+++ kolab-webclient/trunk/debian/changelog	2010-01-04 13:20:17 UTC (rev 1468)
@@ -1,10 +1,12 @@
-kolab-webclient (1.2.0-20090514+debian0-2~pre12) UNRELEASED; urgency=low
+kolab-webclient (1.2.0-20090514+debian0-2~pre13) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
   * Fix "Permissions wrong on /var/log/kolab-webclient/horde.log"
     by depending on kronolith2 >= 2.3.1-1 (Closes: #542188)
   * Depends on dimp1 and sork-passwd-h3 (instead of Recommends) to match
     upstream
+  * Depends on php-net-ldap2
+  * Enable php5 and ssl apache modules during postinst
   * New way to handle configuration files:
     - Install all upstream's configuration files (*.php, conf.xml)
     - Make necessary change to include path

Modified: kolab-webclient/trunk/debian/control
===================================================================
--- kolab-webclient/trunk/debian/control	2010-01-04 10:58:03 UTC (rev 1467)
+++ kolab-webclient/trunk/debian/control	2010-01-04 13:20:17 UTC (rev 1468)
@@ -13,7 +13,7 @@
 Architecture: all
 Depends: ${misc:Depends}, horde3 (>= 3.3.6+debian0-1~),
  dimp1 (>= 1.1.4+debian0-1~), imp4 (>= 4.3.6+debian0-1~), ingo1 (>= 1.2.3+debian0-1~), kronolith2 (>= 2.3.3+debian0-1~), mnemo2 (>= 2.2.3+debian0-1~), nag2 (>= 2.3.4+debian0-1~), sork-passwd-h3 (>= 3.1.2-1~), turba2 (>= 2.3.3+debian0-1~),
- php-db, php5-sqlite, sqlite, php-net-sieve, php-net-smtp
+ php-db, php5-sqlite, sqlite, php-net-sieve, php-net-smtp, php-net-ldap2
 Recommends: aspell, mimp1
 Suggests: kolabd,
  imagemagick | graphicsmagick-imagemagick-compat,

Modified: kolab-webclient/trunk/debian/kolab-webclient.postinst
===================================================================
--- kolab-webclient/trunk/debian/kolab-webclient.postinst	2010-01-04 10:58:03 UTC (rev 1467)
+++ kolab-webclient/trunk/debian/kolab-webclient.postinst	2010-01-04 13:20:17 UTC (rev 1468)
@@ -16,6 +16,15 @@
 }
 
 configure_apache() {
+	if command -v a2enmod >/dev/null 2>&1; then
+		for mod in ssl; do
+			a2enmod $mod >/dev/null
+		done
+
+		if [ -e /etc/apache2/mods-available/php5.load ]; then
+			a2enmod php5 >/dev/null
+		fi
+	fi
 	if command -v invoke-rc.d >/dev/null 2>&1; then
 		invoke-rc.d apache2 force-reload || :
 	else