[cpp-sp] 12/42: Merge in 2.3.1+dfsg-5 changelog

[Scott Cantor]

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

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

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

commit f3a2de6a4c5609aecf43e39e0ef97f3e6fcc8617
Author: Russ Allbery <rra at debian.org>
AuthorDate: Tue Mar 8 17:36:10 2011 -0800

    Merge in 2.3.1+dfsg-5 changelog
    
    We had a lot of branch confusion.  Adjust the changelog so that it
    reflects all the uploads in squeeze.  Further uploads will be from
    the master branch and everything will be clearer.
---
 debian/changelog | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d03e600..d8d0c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-shibboleth-sp2 (2.3.1+dfsg-5) UNRELEASED; urgency=low
+shibboleth-sp2 (2.3.1+dfsg-6) UNRELEASED; urgency=low
 
   [ Ferenc Wagner ]
   * Fix watch file.  The 2.4 prerelease broke it.
@@ -8,6 +8,19 @@ shibboleth-sp2 (2.3.1+dfsg-5) UNRELEASED; urgency=low
 
  -- Russ Allbery <rra at debian.org>  Mon, 29 Nov 2010 15:54:07 -0800
 
+shibboleth-sp2 (2.3.1+dfsg-5) unstable; urgency=high
+
+  * Merge the forgotten pidfile fix from branch bug/unlink-pidfile after
+    merging upstream/2.3.1+dfsg into that.  Original changlog entry:
+
+    Apply upstream fix for shibd removing the PID file when called with
+    the -F option.  This prevents the check of certificate permissions in
+    the init script from removing the PID file of a running shibd.
+
+    (Closes: 611614)
+
+ -- Ferenc Wagner <wferi at niif.hu>  Tue, 01 Feb 2011 16:44:15 +0100
+
 shibboleth-sp2 (2.3.1+dfsg-4) unstable; urgency=low
 
   * Only restart Apache if it is running.  Thanks, Mehdi Dogguy, Michael

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