[Pkg-mono-svn-commits] [SCM] mod-mono branch, master, updated. debian/2.11+git20130708.6b73e85-2

[Jo Shields]

The following commit has been merged in the master branch:
commit ca189d8ecf3ac11eb3202ee9f65907a99e93250b
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jul 10 23:49:49 2013 +0100

    Use dh_apache2 and drop apache2.4-common dependency (closes: #666836).

diff --git a/debian/changelog b/debian/changelog
index d8568ec..ed4a74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mod-mono (2.11+git20130708.6b73e85-2) unstable; urgency=low
+
+  * Use dh_apache2 and drop apache2.4-common dependency (Closes: #666836).
+
+ -- Colin Watson <cjwatson at debian.org>  Wed, 10 Jul 2013 11:14:53 +0100
+
 mod-mono (2.11+git20130708.6b73e85-1) unstable; urgency=low
 
   * [b41e546] Imported Upstream version 2.11+git20130708.6b73e85 (Closes:
diff --git a/debian/control b/debian/control
index 33a5668..d00f48a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,13 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/mod-mono/trunk/
 Vcs-Svn: svn://svn.debian.org/pkg-mono/mod-mono/trunk
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>, Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 7.0.50~), apache2-dev (>= 2.4), po-debconf, pkg-config, mono-runtime
+Build-Depends: debhelper (>= 7.0.50~), dh-apache2, apache2-dev (>= 2.4), po-debconf, pkg-config, mono-runtime
 Standards-Version: 3.9.1
 
 Package: libapache2-mod-mono
 Architecture: any
 Section: web
-Depends: ${misc:Depends}, ${shlibs:Depends}, debconf (>= 1.2.0), apache2.4-common, mono-runtime (>= 2.10), mono-apache-server (>= ${current-version}) | mono-apache-server4 (>= ${current-version}) | mono-apache-server2 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server4 (<< ${next-version}) | mono-apache-server2 (<< ${next-version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, debconf (>= 1.2.0), mono-runtime (>= 2.10), mono-apache-server (>= ${current-version}) | mono-apache-server4 (>= ${current-version}) | mono-apache-server2 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server4 (<< ${next-version}) | mono-apache-server2 (<< ${next-version})
 Description: Apache module for running ASP.NET applications on Mono
  The mod_mono module for Apache allows ASP.NET web applications to be
  run with the Mono .NET implementation.
diff --git a/debian/libapache2-mod-mono.postinst b/debian/libapache2-mod-mono.postinst
index c014dc5..b7b2d9c 100644
--- a/debian/libapache2-mod-mono.postinst
+++ b/debian/libapache2-mod-mono.postinst
@@ -8,18 +8,4 @@ db_version 2.0
 
 #DEBHELPER#
 
-# If we aren't configuring, we don't do anything
-if [ "$1" != "configure" ]; then
-    exit 0
-fi
-
-# We're upgrading, don't ask again
-if [ -n "$2" ]; then
-    exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-    /usr/sbin/a2enmod mod_mono || true
-fi
-
 exit 0
diff --git a/debian/libapache2-mod-mono.prerm b/debian/libapache2-mod-mono.prerm
deleted file mode 100644
index 4e63dd3..0000000
--- a/debian/libapache2-mod-mono.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
-	exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-	/usr/sbin/a2dismod mod_mono || true
-	/usr/sbin/a2dismod mod_mono_auto || true
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 8839208..bc8fbe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,5 +44,5 @@ get-orig-source:
 		--rename
 
 %:
-	dh $@
+	dh $@ --with apache2
 

-- 
mod-mono