Merge commit 'upstream/master' into pub/po

Conflicts:

	debian/changelog
	debian/control

diff --combined IkiWiki.pm
index 63da5d0dd0c24cc4f265caae57c6b7c2e6e9fc3b,2eca82e4d5e2be9026c07d949088751788808e71..d0cfb2d573e68d9c62ea0bc1e7eded25622717e9
--- 1/IkiWiki.pm
--- 2/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 951ffe10e4737a47762f35695545443b3eec9fac,4bbeac1d96ce407941587d349cf80492986aae63..f7d336de26a626edba5963ed6886046cd5690bff
--- 1/debian/changelog
--- 2/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 <joeyh@debian.org>  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 <joeyh@debian.org>  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 <joeyh@debian.org>  Thu, 19 Mar 2009 15:32:49 -0400
+  -- Joey Hess <joeyh@debian.org>  Sat, 04 Apr 2009 14:33:49 -0400
  
  ikiwiki (3.08) unstable; urgency=low
  

diff --combined debian/control
index bcfea7489fb18404fb859f18c33bf8c8cd6dbfcd,a00fd72cc20fbf9fb55391705bcb02f5986417fb..8e7806de3ae6151b39cd792145bff2364f4cf35c
--- 1/debian/control
--- 2/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 <joeyh@debian.org>
  Uploaders: Josh Triplett <josh@freedesktop.org>
  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 1e2a273491653ad2aeb9114b29d95932185dba30,5fc55f5c5a9b2d1a08551bbcb2e9affd4ac78810..bcd2c1a474e89c41e5621f94d9923abf1df7c165
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -32,6 -32,16 +32,16 @@@ Files: tla.p
  Copyright: © 2006 Clint Adams <schizo@debian.org>
  License: GPL-2+
  
+ Files: darcs.pm
+ Copyright:
+  © 2006  Thomas Schwinge <tschwinge@gnu.org>
+    2007  Benjamin A'Lee <bma@bmalee.eu>
+          Tuomo Valkonen <tuomov@iki.fi>
+    2008  Simon Michael <simon@joyful.com>
+          Petr Ročkai <me@mornfall.net>
+          Sven M. Hallberg <pesco@khjk.org>
+ License: GPL-2+
+ 
  Files: teximg.pm
  Copyright: © 2007 Patrick Winnertz <patrick.winnertz@skolelinux.org>
  License: GPL-2+
@@@ -118,10 -128,6 +128,10 @@@ Copyright
   © 2008 Simon McVittie <http://smcv.pseudorandom.co.uk/>
  License: GPL-2+
  
 +Files: po.pm
 +Copyright: © 2008-2009 intrigeri <intrigeri@boum.org>
 +License: GPL-2+
 +
  Files: 404.pm
  Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/>
  License: GPL-2+

diff --combined doc/todo/need_global_renamepage_hook.mdwn
index 874460b292dff86ef6eaa6ab25f5656326bdba84,b123340afc513340df09f1b1f7642ac2b8404dd4..e3cec4a9b1597f3de58347418ae092cacf8ffa1d
--- 1/doc/todo/need_global_renamepage_hook.mdwn
--- 2/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]]