[cpp-sp] 31/47: Rename debian/shib.load to debian/shib2.load

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.1.dfsg1-1
in repository cpp-sp.

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

commit dba892318e743c5aedfacf950de38b666bf7e8c8
Author: Ferenc Wagner <wferi at niif.hu>
AuthorDate: Thu Oct 9 19:08:04 2008 +0200

    Rename debian/shib.load to debian/shib2.load
    
    This is necessary to avoid clashing with the libapache2-mod-shib
    package.  Otherwise its Apache config file breaks our module,
    because libapache2-mod-shib2 doesn't have any shib.conf, and the
    old version is left in place on package removal (unless purged),
    so a2enmod reintroduces it.
---
 debian/changelog                    | 8 ++++++++
 debian/libapache2-mod-shib2.install | 2 +-
 debian/{shib.load => shib2.load}    | 0
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3044320..8ef4de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,14 @@ shibboleth-sp2 (2.1.dfsg1-1) UNRELEASED; urgency=low
 
  -- Ferenc Wagner <wferi at niif.hu>  Thu, 25 Sep 2008 15:20:24 +0200
 
+shibboleth-sp2 (2.0.dfsg1-4) UNRELEASED; urgency=low
+
+  * Rename debian/shib.load to debian/shib2.load to avoid clashing with the
+    libapache2-mod-shib package.  Otherwise its Apache config file breaks our
+    module.
+
+ -- Ferenc Wagner <wferi at niif.hu>  Thu, 09 Oct 2008 19:05:09 +0200
+
 shibboleth-sp2 (2.0.dfsg1-3) unstable; urgency=low
 
   [ Ferenc Wagner ]
diff --git a/debian/libapache2-mod-shib2.install b/debian/libapache2-mod-shib2.install
index 4e943b8..b2026ba 100644
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@ -4,7 +4,7 @@ debian/tmp/etc/shibboleth
 debian/tmp/usr/lib/shibboleth
 debian/tmp/var/run/shibboleth
 
-debian/shib.load	etc/apache2/mods-available
+debian/shib2.load	etc/apache2/mods-available
 
 doc/logo.jpg	usr/share/shibboleth
 doc/main.css	usr/share/shibboleth
diff --git a/debian/shib.load b/debian/shib2.load
similarity index 100%
rename from debian/shib.load
rename to debian/shib2.load

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