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

Russ Allbery rra at debian.org
Fri May 31 00:48:01 UTC 2013


The following commit has been merged in the master branch:
commit 6f606cdff8eacee93900e6035aec101c3ec896ce
Author: Russ Allbery <rra at debian.org>
Date:   Thu May 30 17:31:39 2013 -0700

    Remove now-unncessary maintainer script actions
    
    The default dh_apache2 actions will take care of enabling the module,
    disabling the module, and restarting Apache as needed.

diff --git a/debian/control b/debian/control
index aead0a7..12ec594 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
  Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 9), apache2-dev (>> 2.4), dh-apache2,
+Build-Depends: debhelper (>= 9), apache2-dev (>> 2.4.4), dh-apache2,
  dh-autoreconf, doxygen, graphviz, liblog4cpp5-dev,
  libmemcached-dev (>= 1.0), libsaml2-dev (>= 2.4), libssl-dev, libtool,
  libxerces-c-dev, libxml-security-c-dev (>= 1.6),
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index 09c49d9..9cd4ce7 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -30,14 +30,6 @@ if [ "$1" = "configure" ] ; then
         adduser --system --group --quiet --home /var/log/shibboleth \
             --no-create-home --disabled-login --force-badname _shibd
     fi
-
-    # The new shibd (which is about to be started) requires the corresponding
-    # Apache module, otherwise strange, hard to debug error messages result.
-    if [ -f /etc/apache2/mods-enabled/shib2.load ] ; then
-        if invoke-rc.d apache2 status >/dev/null 2>&1 ; then
-            invoke-rc.d apache2 restart
-        fi
-    fi
 fi
 
 #DEBHELPER#
diff --git a/debian/libapache2-mod-shib2.prerm b/debian/libapache2-mod-shib2.prerm
deleted file mode 100755
index 5b086be..0000000
--- a/debian/libapache2-mod-shib2.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
-    a2dismod shib2 || true
-fi
-
-#DEBHELPER#
-
-exit 0

-- 
Debian packaging for the 2.0 Apache Shibboleth SP



More information about the Pkg-shibboleth-devel mailing list