From 24a57423b85f2c630bece12a3ab767b1c21ac3bb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jul 2013 18:39:18 -0400 Subject: [PATCH 1/1] releasing version 3.20130710 --- debian/changelog | 8 ++++++-- debian/control | 8 ++++---- ikiwiki.spec | 2 +- po/ikiwiki.pot | 48 ++++++++++++++++++++++++------------------------ 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3f4db798..8d55d5df8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20130519) UNRELEASED; urgency=low +ikiwiki (3.20130710) unstable; urgency=low * blogspam: Fix encoding issue in RPC::XML call. Thanks, Changaco @@ -17,8 +17,12 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low full of spammers. * Fix crash that could occur when a needsbuild hook returned a file that does not exist. + * Fix python proxy to not crash when fed unicode data in getstate + and setstate. + Thanks, chrysn + * Fix committing attachments when using svn. - -- Joey Hess Sun, 23 Jun 2013 14:02:01 -0400 + -- Joey Hess Wed, 10 Jul 2013 17:45:40 -0400 ikiwiki (3.20130518) unstable; urgency=low diff --git a/debian/control b/debian/control index 9c6ab7ad9..dbc7b4ac7 100644 --- a/debian/control +++ b/debian/control @@ -10,13 +10,13 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libfile-chdir-perl, libyaml-libyaml-perl, python-support Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Package: ikiwiki Architecture: all -Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, +Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-discount-perl, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-libyaml-perl, libjson-perl @@ -45,8 +45,8 @@ Provides: ikiwiki-plugin-table Description: a wiki compiler Ikiwiki converts a directory full of wiki pages into HTML pages suitable for publishing on a website. Unlike many wikis, ikiwiki does not have its - own ad-hoc means of storing page history, and instead uses a revision control - system such as Subversion or Git. + own ad-hoc means of storing page history, and instead uses a revision + control system such as Subversion or Git. . Ikiwiki implements all of the other standard features of a wiki, including web-based page editing, user registration and logins, a RecentChanges diff --git a/ikiwiki.spec b/ikiwiki.spec index 9d799da3f..91f1be2e3 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20130518 +Version: 3.20130710 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 3f2fac90b..6136e9311 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: 2013-05-18 16:34-0400\n" +"POT-Creation-Date: 2013-07-10 18:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -188,7 +188,7 @@ msgstr "" msgid "creating index page %s" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -203,87 +203,87 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -293,7 +293,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -1164,12 +1164,12 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" -- 2.39.5