X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3429e81596b79a4f9616a985e24c3e0858d0adf2..03b956ab4cb2fee8f7b93e725869060bb45fa4ea:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 31ff168e8..cca58b4f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,37 @@
-ikiwiki (3.20141016) UNRELEASED; urgency=medium
+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
+  * 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
+
+ -- 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
     file is deleted from the underlay.
 
   [ Simon McVittie ]
-  * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra
-    so we can thumbnail SVGs in the docwiki
-  * debian: explicitly depend and build-depend on libcgi-pm-perl
   * core: avoid dangerous use of CGI->param in list context, which led
     to a security flaw in Bugzilla; as far as we can tell, ikiwiki
     is not vulnerable to a similar attack, but it's best to be safe
   * 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
@@ -29,8 +47,14 @@ ikiwiki (3.20141016) UNRELEASED; urgency=medium
     logged in via passwordauth or httpauth
   * templates: add ARIA roles to some page elements, if html5 is enabled.
     Thanks, Patrick
+  * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra
+    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