From: Simon McVittie <smcv@debian.org>
Date: Mon, 9 May 2016 21:18:43 +0000 (+0100)
Subject: Merge branch 'master' into debian-jessie-backports
X-Git-Tag: debian/3.20170111_bpo8+1~10
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/766311f45b4351488d7dad519a6471094a58da16?ds=inline;hp=--cc
Merge branch 'master' into debian-jessie-backports
---
766311f45b4351488d7dad519a6471094a58da16
diff --cc debian/changelog
index dc405232d,81a679282..29189e25b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,23 +1,31 @@@
+ ikiwiki (3.20160509) unstable; urgency=high
+
+ [ Amitai Schlair ]
+ * img: ignore the case of the extension when detecting image format,
+ fixing the regression that *.JPG etc. would not be displayed
+ since 3.20160506
+
+ [ Simon McVittie ]
+ * img: parse img_allowed_formats case-insensitively, as was done in
+ 3.20141016.3
+ * inline: restore backwards compat for show=-1 syntax, which
+ worked before 3.20160121
+ * Remove a spurious changelog entry from 3.20160506 (the relevant
+ change was already in 3.20150614)
+ * Add CVE-2016-4561 reference to 3.20160506 changelog
+ * Set high urgency to get the CVE-2016-4561 fix and CVE-2016-3714
+ mitigation into testing
+
+ -- Simon McVittie <smcv@debian.org> Mon, 09 May 2016 21:57:09 +0100
+
+ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports
+ * debian/tests/control: set INSTALLED_TESTS=1 here, pkg-perl-autopkgtest
+ in jessie didn't support debian/tests/pkg-perl/smoke-env
+
+ -- Simon McVittie <smcv@debian.org> Fri, 06 May 2016 08:58:18 +0100
+
ikiwiki (3.20160506) unstable; urgency=medium
[ Simon McVittie ]