[apache2] 01/06: Removed pre-jessie code from maintainer scripts

[Jean-Michel Vourgère]

This is an automated email from the git hooks/post-receive script.

nirgal pushed a commit to branch master
in repository apache2.

commit 40108e0d7ab678558a37cba20023adc98bf97df4
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Sun Jun 7 23:28:45 2015 +0200

    Removed pre-jessie code from maintainer scripts
---
 debian/apache2.postinst | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 78063cb..010708c 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -45,30 +45,17 @@ enable_default_modules()
 				status ; do
 			a2enmod -m -q $module
 		done
-	elif dpkg --compare-versions "$2" "le" "2.4.6-1~" ; then
-		# These modules had dependencies missing in the initial 2.4 upload
-		for module in auth_basic auth_digest auth_form cache_disk include ratelimit mpm_event
-		do
-			if [ -e /etc/apache2/mods-enabled/$module.load ] ; then
-				# If module is enabled, enable again to
-				# enable new dependencies
-				a2enmod -m -q $module
-			fi
-		done
 	fi
 }
 
 enable_default_conf()
 {
 	if is_fresh_install $@ ; then
-		for conf in charset localized-error-pages other-vhosts-access-log security ; do
+		for conf in charset localized-error-pages other-vhosts-access-log \
+				security serve-cgi-bin ; do
 			a2enconf -m -q $conf
 		done
 	fi
-	# This line must catch upgrades and fresh installs
-	if dpkg --compare-versions "$2" "le" "2.4.1-4" ; then
-		a2enconf -m -q serve-cgi-bin
-	fi
 }
 
 install_default_site()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git