[cpp-sp] 31/36: Fix the Apache module name to match the package

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.5.1+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=abe89dd9e24804d5af0906d5e9c44bd50b74b488

commit abe89dd9e24804d5af0906d5e9c44bd50b74b488
Author: Russ Allbery <rra at debian.org>
AuthorDate: Fri May 31 13:48:34 2013 -0700

    Fix the Apache module name to match the package
    
    Upstream embeds the Apache version in the module name so that
    versions for multiple Apache server versions will be kept distinct,
    but that isn't meaningful within the context of a Debian package.
    Rename the installed module to match the package name and make the
    various Apache Lintian checks happy.
---
 debian/libapache2-mod-shib2.apache2 | 2 +-
 debian/rules                        | 2 +-
 debian/shib2.load                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/libapache2-mod-shib2.apache2 b/debian/libapache2-mod-shib2.apache2
index 8870c5b..02954a9 100644
--- a/debian/libapache2-mod-shib2.apache2
+++ b/debian/libapache2-mod-shib2.apache2
@@ -1,2 +1,2 @@
 mod debian/shib2.load
-mod debian/tmp/usr/lib/apache2/modules/mod_shib_24.so
+mod debian/tmp/usr/lib/apache2/modules/mod_shib2.so
diff --git a/debian/rules b/debian/rules
index a157573..c6ab8f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ override_dh_auto_install:
 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
+	    debian/tmp/usr/lib/apache2/modules/mod_shib2.so
 	pod2man debian/man-pages/mdquery.pod --section 1		\
 	    --center 'Shibboleth' --release $(VERSION)			\
 	    debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
diff --git a/debian/shib2.load b/debian/shib2.load
index ae274ea..9138b72 100644
--- a/debian/shib2.load
+++ b/debian/shib2.load
@@ -1 +1 @@
-LoadModule mod_shib /usr/lib/apache2/modules/mod_shib_22.so
+LoadModule mod_shib /usr/lib/apache2/modules/mod_shib2.so

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.