[mapcache] 38/43: Drop changes for Apache 2.4, not available in wheezy.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapcache.

commit f914211e259c160a55876dce20a6798ddeec9b5c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 23 12:39:11 2013 +0200

    Drop changes for Apache 2.4, not available in wheezy.
---
 debian/changelog                        | 1 -
 debian/control                          | 5 +++--
 debian/libapache2-mod-mapcache.postinst | 9 +++++----
 debian/libapache2-mod-mapcache.prerm    | 6 ++----
 debian/rules                            | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f59d893..88c422d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,6 @@ mapcache (1.0.0-3) UNRELEASED; urgency=low
   * Add watch file.
   * Add maintainer scripts for libmapcache0 to call ldconfig.
   * Add mapcache.xml examples to libapache2-mod-mapcache.
-  * Update for apache 2.4.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 15 Jun 2013 01:34:26 +0200
 
diff --git a/debian/control b/debian/control
index 3c91714..5a1ab7c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
  libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9),
  libgdal1-dev (>=1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
  libfribidi-dev, libcairo2-dev,
- apache2-dev, dh-apache2, libfcgi-dev,
+ apache2-prefork-dev, libfcgi-dev,
  libpcre3-dev, libpixman-1-dev,
  libsqlite3-dev, libtiff4-dev,
  libmapserver-6.2.1, libmapserver-6.2.1-dev,
@@ -77,7 +77,8 @@ Description: tile caching server - tools
 Package: libapache2-mod-mapcache
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ apache2-mpm-prefork | apache2-mpm-itk, apache2.2-common
 Description: tile caching server - Apache module
  This is the MapCache module for the Apache web server implementing OGC web
  services. An alternative mapcache FastCGI program is available in
diff --git a/debian/libapache2-mod-mapcache.postinst b/debian/libapache2-mod-mapcache.postinst
index 2c37b9e..6fe5969 100644
--- a/debian/libapache2-mod-mapcache.postinst
+++ b/debian/libapache2-mod-mapcache.postinst
@@ -9,10 +9,11 @@ if [ "$1" = configure ] ; then
 
 	# only enable on new installs, not on upgrades
 	if [ -z "$2" ] ; then
-		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-			. /usr/share/apache2/apache2-maintscript-helper
-			apache2_invoke enmod mapcache
-		fi
+		a2enmod -q mapcache
+	fi
+	# only restart if mod_something is enabled
+	if [ -e /etc/apache2/mods-enabled/mapcache.load ] ; then
+		invoke-rc.d apache2 restart
 	fi
 fi
 
diff --git a/debian/libapache2-mod-mapcache.prerm b/debian/libapache2-mod-mapcache.prerm
index e7a4c99..35cfdc0 100644
--- a/debian/libapache2-mod-mapcache.prerm
+++ b/debian/libapache2-mod-mapcache.prerm
@@ -3,10 +3,8 @@
 set -e
 
 if [ "$1" = remove ] ; then
-	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-		. /usr/share/apache2/apache2-maintscript-helper
-		apache2_invoke dismod mapcache
-	fi
+	a2dismod -q -f mapcache || true
+	invoke-rc.d apache2 restart
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 7199b0b..356fcd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ CFLAGS+=$(LDFLAGS)
 #CXXFLAGS=$(CFLAGS)
 
 %:
-	dh $@ --with autoreconf,apache2
+	dh $@ --with autoreconf
 
 override_dh_clean:
 	dh_clean

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