Coalesce unreleased versions

[shibboleth/sp.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b628755..7916848 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,26 @@
-shibboleth-sp2 (2.3.1+dfsg-2) UNRELEASED; urgency=low
+shibboleth-sp2 (2.3.1+dfsg-3) unstable; urgency=low
+
+  [ Ferenc Wagner ]
+  * Restart Apache from the postinst script if the shib2 module is enabled
+    to avoid communication errors with the upgraded shibd.  (Closes: #602328)
+  * Fix watch file.  The 2.4 prerelease broke it.
+
+  [ Faidon Liambotis ]
+  * Add myself to Uploaders.
+  * Enable and ship memcache-store.
+
+ -- Ferenc Wagner <wferi@niif.hu>  Mon, 22 Nov 2010 22:17:57 +0100
+
+shibboleth-sp2 (2.3.1+dfsg-2) unstable; urgency=low
 
   * Modify shib-keygen to create the new certificate key group-readable by
-    _shibd and not world-readable.  (Closes: #571631)
+    _shibd and not world-readable.  (Closes: #571631, CVE-2010-2450)
+  * Force source format 1.0 for now since it makes backporting easier.
+  * Update debhelper compatibility level to V7.
+    - Use dh_prep instead of dh_clean -k.
+  * Update standards version to 3.8.4 (no changes required).
 
- -- Russ Allbery <rra@debian.org>  Fri, 14 May 2010 17:29:48 -0700
+ -- Russ Allbery <rra@debian.org>  Sat, 15 May 2010 15:25:12 -0700
 
 shibboleth-sp2 (2.3.1+dfsg-1) unstable; urgency=low