[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.3.1+dfsg-2-11-gf5f2d61

[Russ Allbery]

The following commit has been merged in the master branch:
commit 34c09fe51e6518076481f2aedbcdd5910fc13f71
Author: Russ Allbery <rra at debian.org>
Date:   Mon Nov 29 14:29:49 2010 -0800

    Only restart Apache on package configure if it is running
    
    * Only restart Apache if it is running.  Thanks, Mehdi Dogguy, Michael
      Biebl, and Ferenc Wagner.

diff --git a/debian/changelog b/debian/changelog
index 7916848..ecd671c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shibboleth-sp2 (2.3.1+dfsg-4) unstable; urgency=low
+
+  * Only restart Apache if it is running.  Thanks, Mehdi Dogguy, Michael
+    Biebl, and Ferenc Wagner.
+
+ -- Russ Allbery <rra at debian.org>  Mon, 29 Nov 2010 14:29:42 -0800
+
 shibboleth-sp2 (2.3.1+dfsg-3) unstable; urgency=low
 
   [ Ferenc Wagner ]
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index fcc1b5c..0e4cb1f 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -34,7 +34,9 @@ if [ "$1" = "configure" ] ; then
     # 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
-        invoke-rc.d apache2 restart
+        if invoke-rc.d apache2 status >/dev/null ; then
+            invoke-rc.d apache2 restart
+        fi
     fi
 fi
 

-- 
Debian packaging for the 2.0 Apache Shibboleth SP