[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-5-17-g7b47b27

[Russ Allbery]

The following commit has been merged in the master branch:
commit eee70f55e380e4b0eb338e1da41675ae172d4533
Author: Russ Allbery <rra at debian.org>
Date:   Thu May 30 17:28:29 2013 -0700

    First pass of updating the build system for Apache 2.4

diff --git a/debian/control b/debian/control
index d86a37f..aead0a7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,12 @@ Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
  Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 9), apache2-threaded-dev, dh-autoreconf,
- doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev (>= 1.0),
- libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
- libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),
- opensaml2-schemas, pkg-config, unixodbc-dev, xmltooling-schemas
+Build-Depends: debhelper (>= 9), apache2-dev (>> 2.4), dh-apache2,
+ dh-autoreconf, doxygen, graphviz, liblog4cpp5-dev,
+ libmemcached-dev (>= 1.0), libsaml2-dev (>= 2.4), libssl-dev, libtool,
+ libxerces-c-dev, libxml-security-c-dev (>= 1.6),
+ libxmltooling-dev (>= 1.4), opensaml2-schemas, pkg-config, unixodbc-dev,
+ xmltooling-schemas
 Standards-Version: 3.9.2
 Homepage: http://shibboleth.internet2.edu/
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
@@ -18,7 +19,7 @@ Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: apache2, openssl
+Recommends: openssl
 Conflicts: libapache2-mod-shib
 Description: Federated web single sign-on system (Apache module)
  The Shibboleth System is a standards based software package for web
diff --git a/debian/libapache2-mod-shib2.apache2 b/debian/libapache2-mod-shib2.apache2
new file mode 100644
index 0000000..8870c5b
--- /dev/null
+++ b/debian/libapache2-mod-shib2.apache2
@@ -0,0 +1,2 @@
+mod debian/shib2.load
+mod debian/tmp/usr/lib/apache2/modules/mod_shib_24.so
diff --git a/debian/rules b/debian/rules
index 7134ef8..fc06da7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,14 +35,17 @@ get-orig-source:
 	rm -rf shibboleth-sp2_$(DEBVERS).orig
 	xz shibboleth-sp2_$(DEBVERS).orig.tar
 
+%:
+	dh $@ --with apache2,autoreconf
+
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-	    --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/shibboleth \
-	    --localstatedir=/var --enable-apache-22 \
-	    --with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking \
+	dh_auto_configure --						\
+	    --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/shibboleth	\
+	    --localstatedir=/var --enable-apache-24			\
+	    --with-apxs24=/usr/bin/apxs2 --disable-dependency-tracking	\
 	    --with-memcached $(SYSTEM)
 
 override_dh_auto_install:
@@ -62,34 +65,34 @@ override_dh_auto_install:
 	    debian/libapache2-mod-shib2.shibd.init
 
 override_dh_install:
-	mv debian/tmp/usr/lib/*/shibboleth/mod_shib_22.so \
-	    debian/libapache2-mod-shib2/usr/lib/apache2/modules
-	pod2man debian/man-pages/mdquery.pod --section 1 \
-	    --center 'Shibboleth' --release $(VERSION) \
+	mv debian/tmp/usr/lib/*/shibboleth/mod_shib_24.so \
+	    debian/tmp/usr/lib/apache2/modules
+	pod2man debian/man-pages/mdquery.pod --section 1		\
+	    --center 'Shibboleth' --release $(VERSION)			\
 	    debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
-	pod2man debian/man-pages/resolvertest.pod --section 1 \
-	    --center 'Shibboleth' --release $(VERSION) \
+	pod2man debian/man-pages/resolvertest.pod --section 1		  \
+	    --center 'Shibboleth' --release $(VERSION)			  \
 	    debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
-	pod2man debian/man-pages/shib-metagen.pod --section 1 \
-	    --center 'Shibboleth' --release $(VERSION) \
+	pod2man debian/man-pages/shib-metagen.pod --section 1		  \
+	    --center 'Shibboleth' --release $(VERSION)			  \
 	    debian/libapache2-mod-shib2/usr/share/man/man1/shib-metagen.1
-	pod2man debian/man-pages/shib-keygen.pod --section 8 \
-	    --center 'Shibboleth' --release $(VERSION) \
+	pod2man debian/man-pages/shib-keygen.pod --section 8		 \
+	    --center 'Shibboleth' --release $(VERSION)			 \
 	    debian/libapache2-mod-shib2/usr/share/man/man8/shib-keygen.8
-	pod2man debian/man-pages/shibd.pod --section 8 \
-	    --center 'Shibboleth' --release $(VERSION) \
+	pod2man debian/man-pages/shibd.pod --section 8			\
+	    --center 'Shibboleth' --release $(VERSION)			\
 	    debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
-	dh_install -s -i --fail-missing
+	dh_install -s -i -X mod_shib_24.so --fail-missing
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/RELEASE.txt
 
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt
-	set -e; if [ -d "$(DOCS)" ] ; then \
-	    rm $(DOCS)/html/jquery.js ; \
-	    ln -s /usr/share/javascript/jquery/jquery.min.js \
-		$(DOCS)/html/jquery.js ; \
+	set -e; if [ -d "$(DOCS)" ] ; then			\
+	    rm $(DOCS)/html/jquery.js ;				\
+	    ln -s /usr/share/javascript/jquery/jquery.min.js	\
+		$(DOCS)/html/jquery.js ;			\
 	fi
 
 override_dh_installinit:
@@ -98,6 +101,3 @@ override_dh_installinit:
 override_dh_makeshlibs:
 	dh_makeshlibs -V'libshibsp5 (>= 2.4.3+dfsg-4~)' \
 	    -Xusr/lib/$(DEB_HOST_MULTIARCH)/shibboleth
-
-%:
-	dh $@ --with autoreconf

-- 
Debian packaging for the 2.0 Apache Shibboleth SP