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

diff --git a/debian/changelog b/debian/changelog
index b5bc6bc50..36791fb59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,33 @@
-ikiwiki (3.20141016) 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 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.
+
+  [ Amitai Schlair ]
+  * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
+    Closes: #774441
+
+  [ 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
 
   [ Joey Hess ]
   * Fix crash that can occur when only_committed_changes is set and a
@@ -11,6 +40,7 @@ ikiwiki (3.20141016) UNRELEASED; urgency=medium
   * core: new reverse_proxy option prevents ikiwiki from trying to detect
     how to make self-referential URLs by using the CGI environment variables,
     for instance when it's deployed behind a HTTP reverse proxy
+    (Closes: #745759)
   * core: the default User-Agent is now "ikiwiki/$version" to work around
     ModSecurity rules assuming that only malware uses libwww-perl
   * core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that
@@ -30,8 +60,10 @@ ikiwiki (3.20141016) UNRELEASED; urgency=medium
     so we can thumbnail SVGs in the docwiki
   * debian: explicitly depend and build-depend on libcgi-pm-perl
   * debian: drop unused python-support dependency
+  * debian: rename debian/link to debian/links so the intended symlinks appear
+  * debian: fix some wrong paths in the copyright file
 
- -- Simon McVittie <smcv@debian.org>  Tue, 16 Sep 2014 11:21:16 +0100
+ -- Simon McVittie <smcv@debian.org>  Thu, 16 Oct 2014 23:28:26 +0100
 
 ikiwiki (3.20140916) unstable; urgency=low