diff -Nru libapache-mod-musicindex-1.3.7/debian/changelog libapache-mod-musicindex-1.3.7/debian/changelog
--- libapache-mod-musicindex-1.3.7/debian/changelog	2012-04-07 13:00:43.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/changelog	2013-08-02 17:34:00.000000000 +0000
@@ -1,3 +1,9 @@
+libapache-mod-musicindex (1.3.7-2+rpi1) jessie-staging; urgency=low
+
+  * Apply patch from arno toll in bug 666834 to fix build with apache 2.4
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 02 Aug 2013 17:33:18 +0000
+
 libapache-mod-musicindex (1.3.7-2) unstable; urgency=low
 
   * B-Dep on apache2-threaded-dev
diff -Nru libapache-mod-musicindex-1.3.7/debian/control libapache-mod-musicindex-1.3.7/debian/control
--- libapache-mod-musicindex-1.3.7/debian/control	2012-04-07 13:00:03.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/control	2013-08-02 17:32:36.000000000 +0000
@@ -2,13 +2,15 @@
 Section: httpd
 Priority: optional
 Maintainer: Thibaut VARENE <varenet@debian.org>
-Build-Depends: debhelper (>> 7.0.0), apache2-threaded-dev, libvorbis-dev, libid3tag0-dev, libmad0-dev, libflac-dev, libarchive-dev, libmysqlclient-dev, libmp4v2-dev
+Build-Depends: debhelper (>> 7.0.0), apache2-dev, libvorbis-dev,
+ libid3tag0-dev, libmad0-dev, libflac-dev, libarchive-dev, libmysqlclient-dev,
+ libmp4v2-dev, dh-apache2, libapr1-dev, dpkg-dev (>> 1.16.1~)
 Standards-Version: 3.9.3
 Homepage: http://www.parisc-linux.org/~varenet/musicindex/
 
 Package: libapache2-mod-musicindex
 Architecture: any
-Depends: mod-musicindex-common (= ${source:Version}), apache2.2-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: mod-musicindex-common (= ${source:Version}), ${misc:Depends}
 Description: Browse, stream, download and search through MP3/Ogg/FLAC/MP4 files
  mod_musicindex is aimed at being a C alternative to the Perl module
  Apache::MP3 (http://search.cpan.org/dist/Apache-MP3/).
diff -Nru libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.apache2 libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.apache2
--- libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.apache2	1970-01-01 00:00:00.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.apache2	2013-08-02 17:32:36.000000000 +0000
@@ -0,0 +1,3 @@
+mod     debian/tmp/usr/lib/apache2/modules/*.so
+mod     debian/musicindex.load
+mod     debian/musicindex.conf
diff -Nru libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.install libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.install
--- libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.install	2006-05-31 21:48:48.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/libapache2-mod-musicindex.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/apache2/modules/*.so
-debian/musicindex.load etc/apache2/mods-available
-debian/musicindex.conf etc/apache2/mods-available
diff -Nru libapache-mod-musicindex-1.3.7/debian/patches/port-to-apache24 libapache-mod-musicindex-1.3.7/debian/patches/port-to-apache24
--- libapache-mod-musicindex-1.3.7/debian/patches/port-to-apache24	1970-01-01 00:00:00.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/patches/port-to-apache24	2013-08-02 17:32:36.000000000 +0000
@@ -0,0 +1,38 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,8 +101,11 @@
+ 	printf("AP20\n");
+ #elif (MODULE_MAGIC_COOKIE == 0x41503232UL)
+ 	printf("AP22\n");
++#elif (MODULE_MAGIC_COOKIE > 0x41503232UL)
++       printf("AP24\n");
+ #endif
+-}
++ }
++
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -149,6 +152,11 @@
+   AC_DEFINE([AP22], [], ["AP22"])
+ fi
+ 
++if test x$apache_version = xAP24; then
++  AC_CHECK_PROG(APR_CONFIG, apr-1-config, apr-1-config, [], [], [exit1])
++  AC_DEFINE([AP24], [], ["AP24"])
++fi
++
+ if test "x$APR_CONFIG" != "x"; then
+ 
+ AC_DEFINE([BUILD_FOR_APACHE2], [], ["apache2"])
+--- a/src/mod_musicindex.h
++++ b/src/mod_musicindex.h
+@@ -258,6 +258,8 @@
+   /* nada */
+  #elif defined(AP22)
+   #define ap_http_method ap_http_scheme
++ #elif defined(AP24)
++  #define ap_http_method ap_http_scheme
+  #else
+   #error "unknown apache API"
+  #endif
diff -Nru libapache-mod-musicindex-1.3.7/debian/patches/series libapache-mod-musicindex-1.3.7/debian/patches/series
--- libapache-mod-musicindex-1.3.7/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/patches/series	2013-08-02 17:32:36.000000000 +0000
@@ -0,0 +1 @@
+port-to-apache24
diff -Nru libapache-mod-musicindex-1.3.7/debian/rules libapache-mod-musicindex-1.3.7/debian/rules
--- libapache-mod-musicindex-1.3.7/debian/rules	2012-04-07 09:07:26.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/rules	2013-08-02 17:32:36.000000000 +0000
@@ -62,6 +62,7 @@
 	$(MAKE) -C build-2.2 install DESTDIR=$(CURDIR)/debian/tmp
 
 	dh_install
+	dh_apache2
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
diff -Nru libapache-mod-musicindex-1.3.7/debian/source/options libapache-mod-musicindex-1.3.7/debian/source/options
--- libapache-mod-musicindex-1.3.7/debian/source/options	1970-01-01 00:00:00.000000000 +0000
+++ libapache-mod-musicindex-1.3.7/debian/source/options	2013-08-02 17:32:36.000000000 +0000
@@ -0,0 +1 @@
+extend-diff-ignore = "(^|/)(config.sub|config.guess|configure|Makefile.in|aclocal.m4|config.in|ltmain.sh|mod_musicindex_config.h.in)$"