[SCM] Debian packaging for the Shibboleth Apache SP branch, debian, updated. upstream/1.3.1.dfsg1-149-gd782b7c

Russ Allbery rra at debian.org
Thu Jul 3 02:40:30 UTC 2008


The following commit has been merged in the debian branch:
commit d3942fb3018ee2ad0311c840be6a903307671d15
Author: Russ Allbery <rra at debian.org>
Date:   Wed Jul 2 19:20:24 2008 -0700

    Handle more cases in maintainer scripts
    
    Also disable the module on deconfigure, and re-enable the module on
    abort-deconfigure or abort-remove.

diff --git a/debian/changelog b/debian/changelog
index b353769..a4fd248 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ shibboleth-sp (1.3.1.dfsg1-2) UNRELEASED; urgency=low
   * Reference the Apache 2.0 license in common-licenses instead of
     including a copy.
   * Install upstream's NOTICE.txt in all packages.
+  * Also disable the module on deconfigure, and re-enable the module on
+    abort-deconfigure or abort-remove.
   * Remove the htaccess_sample file in the debian directory.  It wasn't
     installed and the README.Debian documentation is more complete.
   * Update standards version to 3.8.0.
diff --git a/debian/libapache2-mod-shib.postinst b/debian/libapache2-mod-shib.postinst
index 746e447..3b6b29b 100644
--- a/debian/libapache2-mod-shib.postinst
+++ b/debian/libapache2-mod-shib.postinst
@@ -2,9 +2,11 @@
 
 set -e
 
-if [ "$1" = "configure" ] ; then
+case "$1" in
+configure|abort-deconfigure|abort-remove)
     a2enmod shib || true
-fi
+    ;;
+esac
 
 #DEBHELPER#
 
diff --git a/debian/libapache2-mod-shib.prerm b/debian/libapache2-mod-shib.prerm
index dbaabcb..e7bd592 100644
--- a/debian/libapache2-mod-shib.prerm
+++ b/debian/libapache2-mod-shib.prerm
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ "$1" = "remove" ] ; then
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
     a2dismod auth_shib || true
 fi
 

-- 
Debian packaging for the Shibboleth Apache SP



More information about the Pkg-shibboleth-devel mailing list