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

[Russ Allbery]

The following commit has been merged in the master branch:
commit 832ff8e8648da9bd21b2ea1baa7966fad2f9d4a1
Author: Russ Allbery <rra at debian.org>
Date:   Fri Apr 8 12:48:56 2011 -0700

    shibd init script fixes
    
    * Fix LSB Description keyword formatting in the shibd init script.
    * Empty the Default-Stop setting for the shibd init script.  Just
      killing the daemon as part of shutdown should be fine.

diff --git a/configs/shibd-debian.in b/configs/shibd-debian.in
index be513fd..5d68a6b 100644
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@ -2,13 +2,13 @@
 ### BEGIN INIT INFO
 # Provides: shibd
 # Required-Start: $local_fs $remote_fs $network
-# Required-Stop: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs
 # Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Stop:
 # Short-Description: Shibboleth 2 Service Provider Daemon
 # Description: Starts the separate daemon used by the Shibboleth
-# Apache module to manage sessions and to retrieve
-# attributes from Shibboleth Identity Providers.
+#       Apache module to manage sessions and to retrieve
+#       attributes from Shibboleth Identity Providers.
 ### END INIT INFO
 #
 # Written by Quanah Gibson-Mount <quanah at stanford.edu>
diff --git a/debian/changelog b/debian/changelog
index f935447..cbe51ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,9 @@ shibboleth-sp2 (2.4.2+dfsg-1) UNRELEASED; urgency=low
   * Drop the *.la files from /usr/lib/shibboleth.  Upstream does loading
     by *.so files and doesn't use libltdl, and Debian is dropping *.la
     files where possible.
+  * Fix LSB Description keyword formatting in the shibd init script.
+  * Empty the Default-Stop setting for the shibd init script.  Just
+    killing the daemon as part of shutdown should be fine.
   * Update to debhelper compatibility level V8.
     - Use debhelper rule minimization.
   * Update debian/copyright to the current DEP-5 specification.

-- 
Debian packaging for the 2.0 Apache Shibboleth SP