From: Simon McVittie Date: Thu, 22 Jun 2017 08:25:25 +0000 (+0100) Subject: 3.20170622 X-Git-Tag: debian/3.20170622^0 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/664f1f19779a31f42a391182ee2808921803ed76 3.20170622 --- diff --git a/debian/changelog b/debian/changelog index cda8ddf92..6424c5a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20170112) UNRELEASED; urgency=medium +ikiwiki (3.20170622) unstable; urgency=medium * t/git-cgi.t: Wait 1 second before doing a revert that should work. This hopefully fixes a race condition in which the test failed @@ -28,7 +28,7 @@ ikiwiki (3.20170112) UNRELEASED; urgency=medium * debian: Use preferred https URL for Format of debian/copyright * debian: Declare compliance with Debian Policy 4.0.0 - -- Simon McVittie Sun, 14 May 2017 15:34:52 +0100 + -- Simon McVittie Thu, 22 Jun 2017 09:24:57 +0100 ikiwiki (3.20170111) unstable; urgency=high diff --git a/ikiwiki.spec b/ikiwiki.spec index d9d0331e6..cff09e4c6 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20170111 +Version: 3.20170622 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d7f16b649..6dc6bbb05 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-11 18:18+0000\n" +"POT-Creation-Date: 2017-06-22 09:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -583,11 +583,11 @@ msgstr "" msgid "Password" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:53 +#: ../IkiWiki/Plugin/mdwn.pm:74 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:98 +#: ../IkiWiki/Plugin/mdwn.pm:150 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr ""