X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/93930176422d27cb3f18de9e8569545e228da192..91295c8976d17f7635dea5835487720a03826584:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index ba22c917d..36791fb59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-ikiwiki (3.20141016.1) UNRELEASED; urgency=medium
+ikiwiki (3.20141016.2) unstable; urgency=high
+
+  [ Joey Hess ]
+  * Fix XSS in openid selector. Thanks, Raghav Bisht. (Closes: #781483)
+
+ -- Simon McVittie <smcv@debian.org>  Sun, 29 Mar 2015 22:28:15 +0100
+
+ikiwiki (3.20141016.1) unstable; urgency=medium
+
+  * Backport selected commits for Debian 8:
 
   [ Joey Hess ]
   * Add missing build-depends on libcgi-formbuilder-perl, needed for
-    t/relativity.t
+    t/relativity.t if libipc-run-perl is also installed
+    (buildds are unaffected by this)
   * Set Debian package maintainer to Simon McVittie as I'm retiring from
     Debian.
 
@@ -10,7 +20,12 @@ ikiwiki (3.20141016.1) UNRELEASED; urgency=medium
   * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
     Closes: #774441
 
- -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
+  [ Simon McVittie ]
+  * Work around imagemagick Debian bug #771047 by using a non-blank SVG
+    for the regression test, to avoid FTBFS in current unstable
+    if inkscape is installed (buildds are unaffected by this)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 07 Jan 2015 11:08:35 +0000
 
 ikiwiki (3.20141016) unstable; urgency=medium