From: Simon McVittie Date: Mon, 5 Sep 2016 20:50:12 +0000 (+0100) Subject: Merge branch 'master' into debian-jessie-backports X-Git-Tag: debian/3.20170111_bpo8+1~6 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d3c15aed18ef9e67c3e785ac3cc0426c56e59ac7?ds=sidebyside Merge branch 'master' into debian-jessie-backports --- d3c15aed18ef9e67c3e785ac3cc0426c56e59ac7 diff --cc debian/changelog index 59322743a,1fed2c096..d9782380d --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,14 +1,23 @@@ - ikiwiki (3.20160728~bpo8+1) jessie-backports; urgency=medium ++ikiwiki (3.20160905~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 Thu, 28 Jul 2016 10:48:11 +0100 ++ -- Simon McVittie Mon, 05 Sep 2016 21:49:22 +0100 ++ + ikiwiki (3.20160905) unstable; urgency=medium + + [ Joey Hess ] + * Fix installation when prefix includes a string metacharacter. + Thanks, Sam Hathaway. + + [ Simon McVittie ] + * Use git log --no-renames to generate recentchanges, fixing the git + test-case with git 2.9 (Closes: #835612) + + -- Simon McVittie Mon, 05 Sep 2016 21:26:19 +0100 ikiwiki (3.20160728) unstable; urgency=medium