[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, lenny, updated. debian/2.0.dfsg1-3-4-g937ad6d

[Ferenc Wagner]

The following commit has been merged in the lenny branch:
commit 36c7fa6dd06e63a0515f308ca10402e5172736cc
Author: Ferenc Wagner <wferi at niif.hu>
Date:   Tue Oct 14 16:51:54 2008 +0200

    Revert "Automatically enable the Apache module on installation"
    
    This reverts commit 2dfc1172d64bfee99582ca518d8e9fdaf16ca7ca.
    Because after reading our README I realised this wasn't an oversight
    but a conscious decision in the version 2 package.

diff --git a/debian/changelog b/debian/changelog
index ae5ca2c..701d8df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,8 @@ 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.
-  * Automatically enable the Apache module on installation.
 
- -- Ferenc Wagner <wferi at niif.hu>  Fri, 10 Oct 2008 01:29:18 +0200
+ -- Ferenc Wagner <wferi at niif.hu>  Thu, 09 Oct 2008 19:05:09 +0200
 
 shibboleth-sp2 (2.0.dfsg1-3) unstable; urgency=low
 
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
deleted file mode 100755
index cd01936..0000000
--- a/debian/libapache2-mod-shib2.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-configure|abort-deconfigure|abort-remove)
-    a2enmod shib2 || true
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libapache2-mod-shib2.prerm b/debian/libapache2-mod-shib2.prerm
index 5b086be..f7fef59 100755
--- a/debian/libapache2-mod-shib2.prerm
+++ b/debian/libapache2-mod-shib2.prerm
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
-    a2dismod shib2 || true
+    a2dismod shib || true
 fi
 
 #DEBHELPER#

-- 
Debian packaging for the 2.0 Apache Shibboleth SP