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

[Russ Allbery]

The following commit has been merged in the master branch:
commit b8e73ec391a1fcae1e88fcfc733227065652cbe3
Author: Russ Allbery <rra at debian.org>
Date:   Fri May 31 13:53:36 2013 -0700

    Drop old postinst code for libapache2-mod-shib upgrades
    
    * Drop postinst code to handle upgrades from the Shibboleth 1.x module,
      which was last included in lenny.

diff --git a/debian/changelog b/debian/changelog
index c7c84af..ddb4cfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,8 @@ shibboleth-sp2 (2.5.1+dfsg-1) UNRELEASED; urgency=low
   * 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.
+  * Drop postinst code to handle upgrades from the Shibboleth 1.x module,
+    which was last included in lenny.
   * Switch to xz compression for the repackaged upstream
     source, *.debian.tar, and the *.deb packages.
   * Update upstream Homepage.
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index 9cd4ce7..1e14f74 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -2,29 +2,8 @@
 
 set -e
 
-# Prior to 2.0.dfsg1-4, we named our Apache configuration files shib instead
-# of shib2.  We therefore need to unlink the old configuration files, and if
-# they were linked in, we should link in the new ones.
-#
-# We also have to work around a bug in the etch Shibboleth SP 1.x packages
-# that caused them to remove the wrong module configuration and hence not
-# unlink their configuration.  If the 1.x configuration is still linked in, it
-# will break the 2.x module, so make sure it's disabled on initial install.
+# Add a user as which to run the shibd daemon.
 if [ "$1" = "configure" ] ; then
-    if dpkg --compare-versions "$2" lt-nl 2.0.dfsg1-4 ; then
-        if [ -f /etc/apache2/mods-enabled/shib.load ] ; then
-            a2enmod shib2
-        fi
-        a2dismod shib || true
-    fi
-
-    # Most of the time, this will produce an error message.  It only does
-    # anything if we're replacing a broken libapache2-mod-shib package.
-    # Suppress the normally useless error message to not confuse people.
-    if [ -z "$2" ] ; then
-        a2dismod shib 2>/dev/null || true
-    fi
-
     if ! getent passwd _shibd > /dev/null ; then
         echo 'Adding system-user for Shibboleth daemon' 1>&2
         adduser --system --group --quiet --home /var/log/shibboleth \

-- 
Debian packaging for the 2.0 Apache Shibboleth SP