From: intrigeri Date: Sat, 6 Jun 2009 12:03:40 +0000 (+0200) Subject: Merge commit 'upstream/master' into pub/po X-Git-Tag: 3.15~183 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86edd73d169600875a10a635ef8df4a644545b0d;p=ikiwiki.git Merge commit 'upstream/master' into pub/po Conflicts: debian/changelog debian/control Signed-off-by: intrigeri --- 86edd73d169600875a10a635ef8df4a644545b0d diff --cc debian/changelog index 4e1aa8545,7f8257813..d72efe455 --- a/debian/changelog +++ b/debian/changelog @@@ -1,13 -1,43 +1,47 @@@ - ikiwiki (3.14) UNRELEASED; urgency=low + ikiwiki (3.15) UNRELEASED; urgency=low + * comment: Make comment directives no longer use the internal "_comment" + form, and document the comment directive syntax. + * Avoid relying on translators preserving the case when translating + "discussion", which caused Discussion pages to get unwanted Discussion + links. + * Tighten up matching of bare words inside directives; do not + allow an unterminated """ string to be treated as a series + of bare words. Fixes runaway regexp recursion/backtracking + in strange situations. + * Setup automator: Check that each plugin added to the generated + setup file can be loaded and that its config is ok. If a plugin + fails for any reason, disable it in the generated file. + Closes: 532001 + * pagecount: Fix broken optimisation for * pagespec. + * goto: Support being passed a page title that is not a valid page + name, to support several cases including mercurial's long user + names on the RecentChanges page, and urls with spaces being handled + by the 404 plugin. + * Add new hooks: canremove, canrename, rename. (intrigeri) + * rename: Refactor subpage rename handling code into rename hook. (intrigeri) + * po: New plugin, suporting translation of wiki pages using po files. + (intrigeri) - -- Joey Hess Mon, 20 Apr 2009 19:40:25 -0400 + -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 - ikiwiki (3.13) UNRELEASED; urgency=low + ikiwiki (3.14) unstable; urgency=low + + * highlight: New plugin supporting syntax highlighting of pretty much + anything. + * debian/control: Add suggests for libhighlight-perl, although + that package is not yet created by Debian's highlight source package. + (See #529869) + * format: Provide a htmlizefallback hook that other plugins + can use to handle formats that are not suitable for general-purpose + htmlize hooks. Used by highlight. + * Fix test suite to not rely on an installed copy of ikiwiki after + underlaydir change. Closes: #530502 + * Danish translation update. Closes: #530877 + + -- Joey Hess Mon, 01 Jun 2009 13:05:34 -0400 + + ikiwiki (3.13) unstable; urgency=low * ikiwiki-transition: If passed a nonexistant srcdir, or one not containing .ikiwiki, abort with an error rather than creating it. diff --cc debian/control index 05ccd0df3,233de8f7c..5205ed749 --- a/debian/control +++ b/debian/control @@@ -35,7 -35,7 +35,8 @@@ Suggests: viewvc | gitweb | viewcvs, li liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, - libsort-naturally-perl, libtext-textile-perl, po4a (>= 0.35-1), gettext - libsort-naturally-perl, libtext-textile-perl, libhighlight-perl ++ libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, ++ po4a (>= 0.35-1), gettext Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table