Package: mod-dnssd
Followup-For: Bug #666829

Attached patch adds preliminary support (aka it builds) for Apache 2.4.

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff --git a/debian/changelog b/debian/changelog
index 665e894..2715a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mod-dnssd (0.6-4) unstable; urgency=low
+
+  * Add support for Apache 2.4
+
+ -- Ondřej Surý <ond...@debian.org>  Tue, 07 May 2013 09:44:29 +0200
+
 mod-dnssd (0.6-3) unstable; urgency=low
 
   * Bump Standards-Version to 3.9.2. No other change needed.
diff --git a/debian/control b/debian/control
index 14783c7..dd9dfd4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: net
 Priority: optional
 Maintainer: Regis Boudin <re...@debian.org>
 Uploaders: Sebastien ESTIENNE <sebastien.estie...@gmail.com>
-Build-Depends: debhelper (>= 5.0.0), apache2-prefork-dev | apache2-threaded-dev, libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev
+Build-Depends: debhelper (>= 5.0.0), apache2-dev, libavahi-client-dev (>= 0.6.4), lynx, libapr1-dev
 Standards-Version: 3.9.2
 Homepage: http://0pointer.de/lennart/projects/mod_dnssd/
 
 Package: libapache2-mod-dnssd
 Architecture: any
-Depends: ${shlibs:Depends}, avahi-daemon (>= 0.6.5), apache2.2-bin, ${misc:Depends}
+Depends: ${shlibs:Depends}, avahi-daemon (>= 0.6.5), ${misc:Depends}
 Description: Zeroconf support for Apache 2 via avahi
  mod_dnssd is an Apache HTTPD module which adds Zeroconf support 
  via DNS-SD using Avahi. This allows Apache to advertise itself and the
diff --git a/debian/libapache2-mod-dnssd.apache2 b/debian/libapache2-mod-dnssd.apache2
new file mode 100644
index 0000000..81aac74
--- /dev/null
+++ b/debian/libapache2-mod-dnssd.apache2
@@ -0,0 +1,3 @@
+mod src/.libs/mod_dnssd.so
+mod debian/mod-dnssd.conf
+mod debian/mod-dnssd.load
diff --git a/debian/libapache2-mod-dnssd.install b/debian/libapache2-mod-dnssd.install
deleted file mode 100644
index 2b056f5..0000000
--- a/debian/libapache2-mod-dnssd.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/mod-dnssd.load /etc/apache2/mods-available
-debian/mod-dnssd.conf /etc/apache2/mods-available
diff --git a/debian/libapache2-mod-dnssd.prerm b/debian/libapache2-mod-dnssd.prerm
deleted file mode 100644
index 50db09a..0000000
--- a/debian/libapache2-mod-dnssd.prerm
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#DEBHELPER#
-
-if [ "$1" != "remove" -a "$1" != "purge" ]; then
-	exit 0
-fi
-
-if [ -e /etc/apache2/apache2.conf ]; then
-	a2dismod mod-dnssd || true
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index c1607ec..70be43e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,8 @@ install: build
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	dh_install src/.libs/mod_dnssd.so `apxs2 -q LIBEXECDIR`
+	dh_install
+	dh_apache2
 
 # Build architecture-independent files here.
 binary-indep: build install

Reply via email to