From: intrigeri Date: Mon, 20 Apr 2009 10:21:18 +0000 (+0200) Subject: Merge commit 'upstream/master' into pub/po X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4558457402a4ab6bc795589a2e400fa66144f76e Merge commit 'upstream/master' into pub/po Conflicts: debian/changelog debian/control --- 4558457402a4ab6bc795589a2e400fa66144f76e diff --cc 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) diff --cc debian/control index bcfea7489,a00fd72cc..8e7806de3 --- a/debian/control +++ b/debian/control @@@ -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