[shibboleth-sp2] 07/12: Install the Apache module by dh_install

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit 3e6b865d4e277690d4d7f40309b9a49ecfeb9769
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Mar 11 13:14:43 2016 +0100

    Install the Apache module by dh_install
    
    This lets us get rid of the exclude option of dh_install;
    -s and -i were superfluous anyway.
---
 debian/libapache2-mod-shib2.apache2 | 1 -
 debian/libapache2-mod-shib2.install | 3 +++
 debian/rules                        | 5 +----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/libapache2-mod-shib2.apache2 b/debian/libapache2-mod-shib2.apache2
index 02954a9..923dd0c 100644
--- a/debian/libapache2-mod-shib2.apache2
+++ b/debian/libapache2-mod-shib2.apache2
@@ -1,2 +1 @@
 mod debian/shib2.load
-mod debian/tmp/usr/lib/apache2/modules/mod_shib2.so
diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
old mode 100644
new mode 100755
index 7d581cb..7656268
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -1,2 +1,5 @@
+#!/usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/shibboleth/mod_shib_24.so => usr/lib/apache2/modules/mod_shib2.so
 usr/share/shibboleth
 var/log/shibboleth-www
diff --git a/debian/rules b/debian/rules
index 37867fa..5429434 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,10 +58,7 @@ override_dh_auto_install:
 	    debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
 
 override_dh_install:
-	mkdir -p debian/tmp/usr/lib/apache2/modules
-	mv debian/tmp/usr/lib/*/shibboleth/mod_shib_24.so \
-	    debian/tmp/usr/lib/apache2/modules/mod_shib2.so
-	dh_install -s -i -X mod_shib2.so --fail-missing
+	dh_install --fail-missing
 
 UTIL_MANS:=$(patsubst %,debian/%, \
     mdquery.1 resolvertest.1 shib-metagen.1 shib-keygen.8 shibd.8)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git