Merge commit 'intrigeri/po' into po

3 files changed, 68 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 951ffe10e..f7d336de2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +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 +37,12 @@ ikiwiki (3.09) UNRELEASED; urgency=low
   * 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 --git a/debian/control b/debian/control
index bcfea7489..8e7806de3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,11 @@ Source: ikiwiki
 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 @@ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki
 
 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, po4a (>= 0.35-1), gettext
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
diff --git a/debian/copyright b/debian/copyright
index 1e2a27349..bcd2c1a47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -32,6 +32,16 @@ Files: tla.pm
 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+