note that the two potential FTBFSs do not actually affect buildds

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index eb1be58803e4930709262e1f0caba0b961dbfc7c..dccbb21c0baa84e66a1fd8c866c845f404e62579 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,26 @@
-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 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
@@ -34,7 +56,7 @@ ikiwiki (3.20141016) UNRELEASED; urgency=medium
   * 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