[cpp-sp] 20/40: Merge branch 'debian'

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to annotated tag debian/2.2.1+dfsg-1
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=0309ef45aa9d7b4c8386bd530eb07068c5da06a2

commit 0309ef45aa9d7b4c8386bd530eb07068c5da06a2
Merge: 7657e20 f1ce1d2
Author: Russ Allbery <rra at debian.org>
AuthorDate: Fri Aug 21 11:40:40 2009 -0700

    Merge branch 'debian'

 configs/shibd-debian.in                           |  6 ++++++
 debian/changelog                                  |  6 ++++++
 debian/control                                    | 14 +++++++-------
 debian/{libshibsp2.install => libshibsp3.install} |  0
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --cc configs/shibd-debian.in
index 3b59c86,889372d..d9e6e56
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -67,11 -70,15 +70,14 @@@ stop
      echo "$NAME."
      ;;
  restart|force-reload)
+     # Ensure @-PKGRUNDIR-@ exists.  /var/run may be on a tmpfs file system.
+     [ -d '@-PKGRUNDIR-@' ] || mkdir -p '@-PKGRUNDIR-@'
+ 
      echo -n "Restarting $DESC: "
      start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 -        --exec $DAEMON
 -    sleep 1
 -    start-stop-daemon --start --quiet \
 -        --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
 +        --retry TERM/30/KILL/5 --exec $DAEMON
 +    start-stop-daemon --start --quiet --pidfile $PIDFILE \
 +        --exec $DAEMON -- $DAEMON_OPTS
      echo "$NAME."
      ;;
  *)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.