[cpp-sp] 14/36: Remove Conflicts with libapache2-mod-shib

[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=8028730935aab76822b190623a17f17fe40bc2f3

commit 8028730935aab76822b190623a17f17fe40bc2f3
Author: Russ Allbery <rra at debian.org>
AuthorDate: Thu May 30 17:40:40 2013 -0700

    Remove Conflicts with libapache2-mod-shib
    
    * Remove Conflicts with libapache2-mod-shib.  lenny is dead.
---
 debian/changelog | 1 +
 debian/control   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e94bc4f..1d93ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ shibboleth-sp2 (2.5.1+dfsg-1) UNRELEASED; urgency=low
     dh-autoreconf.
   * Add Multi-Arch: same to libshibsp-dev and Multi-Arch: foreign to
     libshibsp-doc and shibboleth-sp2-schemas.
+  * Remove Conflicts with libapache2-mod-shib.  lenny is dead.
   * Install the upstream doc/RELEASE.txt file as the upstream changelog.
     It's not exactly a changelog, but it has pointers to the upstream web
     documentation of changes, which is probably what people are looking for.
diff --git a/debian/control b/debian/control
index c4c909c..ee03b43 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Section: httpd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 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
  single sign-on across or within organizational boundaries.  It supports
@@ -88,7 +87,6 @@ Section: text
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Conflicts: libapache2-mod-shib
 Description: Federated web single sign-on system (schemas)
  The Shibboleth System is a standards based software package for web
  single sign-on across or within organizational boundaries.  It supports

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