[pkg-kolab] r893 - kolab-freebusy/trunk/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-06-28 14:12:38 +0000 (Sat, 28 Jun 2008)
New Revision: 893

Modified:
   kolab-freebusy/trunk/debian/changelog
   kolab-freebusy/trunk/debian/postinst
   kolab-freebusy/trunk/debian/prerm
Log:
debian/prerm, debian/postinst: conditionnaly uses apache2 tools


Modified: kolab-freebusy/trunk/debian/changelog
===================================================================
--- kolab-freebusy/trunk/debian/changelog	2008-06-28 13:34:24 UTC (rev 892)
+++ kolab-freebusy/trunk/debian/changelog	2008-06-28 14:12:38 UTC (rev 893)
@@ -9,5 +9,6 @@
     fields)
   * debian/control: defaults to libapache2-mod-php5 but permit other CGI
     http servers.
+  * debian/prerm, debian/postinst: conditionnaly uses apache2 tools
 
- -- Mathieu Parent <math.parent at gmail.com>  Sat, 28 Jun 2008 15:32:30 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Sat, 28 Jun 2008 16:08:27 +0200

Modified: kolab-freebusy/trunk/debian/postinst
===================================================================
--- kolab-freebusy/trunk/debian/postinst	2008-06-28 13:34:24 UTC (rev 892)
+++ kolab-freebusy/trunk/debian/postinst	2008-06-28 14:12:38 UTC (rev 893)
@@ -11,16 +11,19 @@
 }
 
 configure_apache() {
-	for mod in rewrite ssl ldap; do
-		a2enmod $mod >/dev/null
-	done
+	#a2enmod and a2ensite are in same package apache*-common
+	if command -v a2enmod >/dev/null 2>&1; then
+		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
+		if [ -e /etc/apache2/mods-available/php5.load ]; then
+			a2enmod php5 >/dev/null
+		fi
+
+		a2ensite kolab >/dev/null
 	fi
 
-	a2ensite kolab >/dev/null
-
 	if command -v invoke-rc.d >/dev/null 2>&1; then
 		invoke-rc.d apache2 force-reload || :
 	else

Modified: kolab-freebusy/trunk/debian/prerm
===================================================================
--- kolab-freebusy/trunk/debian/prerm	2008-06-28 13:34:24 UTC (rev 892)
+++ kolab-freebusy/trunk/debian/prerm	2008-06-28 14:12:38 UTC (rev 893)
@@ -1,5 +1,9 @@
 #! /bin/sh
 
-a2dissite kolab >/dev/null
+if command -v a2dissite >/dev/null 2>&1; then
+  a2dissite kolab >/dev/null
+else
+  rm -f /etc/apache2/sites-enabled/kolab
+fi
 
 #DEBHELPER#