From: intrigeri Date: Mon, 20 Apr 2009 10:21:18 +0000 (+0200) Subject: Merge commit 'upstream/master' into pub/po X-Git-Tag: 3.15~189^2 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4558457402a4ab6bc795589a2e400fa66144f76e?ds=sidebyside;hp=-c Merge commit 'upstream/master' into pub/po Conflicts: debian/changelog debian/control --- 4558457402a4ab6bc795589a2e400fa66144f76e diff --combined IkiWiki.pm index 63da5d0dd,2eca82e4d..d0cfb2d57 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@@ -321,7 -321,7 +321,7 @@@ sub getsetup () default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./, qr/\.x?html?$/, qr/\.ikiwiki-new$/, qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//, - qr/(^|\/)_MTN\//, + qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//, qr/\.dpkg-tmp$/], description => "regexps of source files to ignore", safe => 0, @@@ -1339,7 -1339,7 +1339,7 @@@ sub check_content (@) foreach my $line (split("\n", $params{content})) { push @diff, $line if ! exists $old{$_}; } - $params{content}=join("\n", @diff); + $params{diff}=join("\n", @diff); } my $ok; diff --combined debian/changelog index 951ffe10e,4bbeac1d9..f7d336de2 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,22 +1,31 @@@ - ikiwiki (3.09) UNRELEASED; urgency=low ++ikiwiki (3.11) unstable; urgency=low ++ ++ * 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 ++ + ikiwiki (3.10) unstable; urgency=low + + * darcs: Finally added support for this VCS, thanks to many + contributors: + - Thomas Schwinge wrote the original file, implementing only rcs_commit. + - Benjamin A'Lee contributed an alternative implementation. + - Tuomo Valkonen contributed rcs_getctime and stub rcs_recentchanges. + - Simon Michael contributed multiple changes. + - Petr Ročkai fixed rcs_recentchanges. + - Sven M. Hallberg merged the above and added missing features. + * Add missing newline to Confirm Password prompt. + * Add missing permalink support to archivepage and titlepage templates. + * debian/control: Wrap fields. + * inline: Add author info to archive display. + * Add a microblog template that is useful for inlining microblogging posts. + + -- Joey Hess Sat, 18 Apr 2009 19:40:25 -0400 + + ikiwiki (3.09) unstable; urgency=low * inline: Add title_natural sort order, using Sort::Naturally (chrysn) @@@ -10,12 -28,12 +37,12 @@@ * comments: Fix too loose test for comments pages that matched normal pages with "comment_" in their name. Closes: #521322 * comments: Fix anchor ids to be legal xhtml. Closes: #521339 - * 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) + * Fix documentation of anonok_pagespec. Closes: #521793 + * Add missing suggests on libtext-textile-perl. Closes: #522039 + * recentchanges: change to using do=goto links for user links. + * Fix git test suite to use a bare repo. - -- Joey Hess Thu, 19 Mar 2009 15:32:49 -0400 + -- Joey Hess Sat, 04 Apr 2009 14:33:49 -0400 ikiwiki (3.08) unstable; urgency=low diff --combined debian/control index bcfea7489,a00fd72cc..8e7806de3 --- a/debian/control +++ b/debian/control @@@ -2,7 -2,11 +2,11 @@@ Source: ikiwik Section: web Priority: optional Build-Depends: perl, debhelper (>= 7.0.50) - Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick + Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, + libtext-markdown-perl | markdown, + libtimedate-perl, libhtml-template-perl, + libhtml-scrubber-perl, wdg-html-validator, + libhtml-parser-perl, liburi-perl, perlmagick Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.0 @@@ -12,9 -16,26 +16,26 @@@ Vcs-Browser: http://git.ikiwiki.info/?p Package: ikiwiki Architecture: all - Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl - Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl - Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, 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, po4a (>= 0.35-1), gettext + Depends: ${misc:Depends}, ${perl:Depends}, + libtext-markdown-perl | markdown, + libhtml-scrubber-perl, libhtml-template-perl, + libhtml-parser-perl, liburi-perl + Recommends: gcc | c-compiler, + libc6-dev | libc-dev, + subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), + libxml-simple-perl, libnet-openid-consumer-perl, + liblwpx-paranoidagent-perl, libtimedate-perl, + libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), + libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl + Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, + xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, + python, python-docutils, polygen, tidy, libhtml-tree-perl, + libxml-feed-perl, libmailtools-perl, perlmagick, + libfile-mimeinfo-perl, libcrypt-ssleay-perl, + 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 ++ libsort-naturally-perl, libtext-textile-perl, po4a (>= 0.35-1), gettext Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table diff --combined debian/copyright index 1e2a27349,5fc55f5c5..bcd2c1a47 --- a/debian/copyright +++ b/debian/copyright @@@ -32,6 -32,16 +32,16 @@@ Files: tla.p Copyright: © 2006 Clint Adams License: GPL-2+ + Files: darcs.pm + Copyright: + © 2006 Thomas Schwinge + 2007 Benjamin A'Lee + Tuomo Valkonen + 2008 Simon Michael + Petr Ročkai + Sven M. Hallberg + License: GPL-2+ + Files: teximg.pm Copyright: © 2007 Patrick Winnertz License: GPL-2+ @@@ -118,10 -128,6 +128,10 @@@ Copyright © 2008 Simon McVittie License: GPL-2+ +Files: po.pm +Copyright: © 2008-2009 intrigeri +License: GPL-2+ + Files: 404.pm Copyright: © 2009 Simon McVittie License: GPL-2+ diff --combined doc/todo/need_global_renamepage_hook.mdwn index 874460b29,b123340af..e3cec4a9b --- a/doc/todo/need_global_renamepage_hook.mdwn +++ b/doc/todo/need_global_renamepage_hook.mdwn @@@ -61,7 -61,7 +61,7 @@@ would solve my problem. Hmmm? --[[intri >>> not be broken. I will thus keep the existing `renamepage` as it >>> is, and call `rename` the global hook I need. --[[intrigeri]] ->>>> Done in my `po` branch. --[[intrigeri]] +>>>> [[Done]] in my `po` branch. --[[intrigeri]] I think I see a problem in the rename hook. The hook is called before the plugin adds any subpages to the set of pages to rename. @@@ -111,3 -111,5 +111,5 @@@ hashes is desired, it could return the >>>> It looks good. I made some small changes to it in my own po branch. >>>> Nothing significant really. If this were not tied up in the po branch, >>>> I've have merged it to master already. --[[Joey]] + + >>>> Thanks, this is great :) --[[intrigeri]]