[SCM] mapcache branch, master, updated. upstream/1.0.0-48-ga2a666f

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 16ca3a833a6d04c8eb1ce4de050767422c1d57a7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 23 11:01:21 2013 +0200

    Update for apache 2.4.

diff --git a/debian/changelog b/debian/changelog
index b104b0e..f294604 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ 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 6e8b91c..c8eaced 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
  libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9),
  libgdal1-dev (>=1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
  libfribidi-dev, libcairo2-dev,
- apache2-prefork-dev, libfcgi-dev,
+ apache2-dev, dh-apache2, libfcgi-dev,
  libpcre3-dev, libpixman-1-dev,
  libsqlite3-dev, libtiff4-dev,
  libmapserver-6.2.1, libmapserver-6.2.1-dev,
@@ -77,8 +77,7 @@ Description: tile caching server - tools
 Package: libapache2-mod-mapcache
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- apache2-mpm-prefork | apache2-mpm-itk, apache2.2-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
 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.apache2 b/debian/libapache2-mod-mapcache.apache2
new file mode 100644
index 0000000..f9a1d2f
--- /dev/null
+++ b/debian/libapache2-mod-mapcache.apache2
@@ -0,0 +1,2 @@
+mod apache/.libs/mod_mapcache.so
+mod debian/mapcache.load
diff --git a/debian/libapache2-mod-mapcache.postinst b/debian/libapache2-mod-mapcache.postinst
index 6fe5969..2c37b9e 100644
--- a/debian/libapache2-mod-mapcache.postinst
+++ b/debian/libapache2-mod-mapcache.postinst
@@ -9,11 +9,10 @@ if [ "$1" = configure ] ; then
 
 	# only enable on new installs, not on upgrades
 	if [ -z "$2" ] ; then
-		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
+		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+			. /usr/share/apache2/apache2-maintscript-helper
+			apache2_invoke enmod mapcache
+		fi
 	fi
 fi
 
diff --git a/debian/libapache2-mod-mapcache.prerm b/debian/libapache2-mod-mapcache.prerm
index 35cfdc0..e7a4c99 100644
--- a/debian/libapache2-mod-mapcache.prerm
+++ b/debian/libapache2-mod-mapcache.prerm
@@ -3,8 +3,10 @@
 set -e
 
 if [ "$1" = remove ] ; then
-	a2dismod -q -f mapcache || true
-	invoke-rc.d apache2 restart
+	if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+		. /usr/share/apache2/apache2-maintscript-helper
+		apache2_invoke dismod mapcache
+	fi
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index c90f35e..5b2fad3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ CFLAGS+=$(CPPFLAGS)
 CFLAGS+=$(LDFLAGS)
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,apache2
 
 override_dh_clean:
 	dh_clean

-- 
Packaging for MapCache