4 files changed, 51 insertions, 16 deletions
diff --git a/debian/NEWS b/debian/NEWS
index 614eb11f8..b796154fa 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,10 +1,19 @@
-ikiwiki (3.20100320) UNRELEASED; urgency=low
+ikiwiki (3.20100406) unstable; urgency=low
+  
+  The title_natural sort method (as used by the inline directive, etc)
+  have been moved to the new sortnaturally plugin, which is not enabled
+  by default since it requires the Sort::Naturally perl module.
+
+  Starting from this version, the `tagged()` pagespec only matches tags,
+  not regular wikilinks. If your wiki accidentially relied on the old,
+  buggy behavior, you might need to change pagespecs to use `link()`.
 
-  The sort="title_natural" option on [[!inline]] etc. now requires the
-  new sortnaturally plugin. This is not enabled by default, because it requires
-  the Sort::Naturally module.
+  To support the above change, all wikis need to be rebuilt on upgrade to
+  this version. If you listed your wiki in /etc/ikiwiki/wikilist this will
+  be done automatically when the Debian package is upgraded. Or use 
+  ikiwiki-mass-rebuild to force a rebuild.
 
- -- Simon McVittie <smcv@debian.org>  Sat, 03 Apr 2010 13:46:08 +0100
+ -- Simon McVittie <smcv@debian.org>  Tue, 06 Apr 2010 20:53:07 +0100
 
 ikiwiki (3.20091017) unstable; urgency=low
 
diff --git a/debian/changelog b/debian/changelog
index 4d0639a58..435b7982f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,19 @@
-ikiwiki (3.20100320) UNRELEASED; urgency=low
+ikiwiki (3.20100406) UNRELEASED; urgency=low
+
+  * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
+  * comments: Fix missing entity encoding in title.
+  * txt: Add a special case for robots.txt.
+  * Add support for link types, and make the the tagged() pagespec only
+    match tags, not regular links (a bugfix). 
+  * Rebuild wikis on upgrade to this version to get tag link types recorded
+    correctly.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
+
+ikiwiki (3.20100403) unstable; urgency=low
 
   * websetup: Add websetup_unsafe to allow marking other settings
     as unsafe.
-  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
-    to get the user's email address and username.
   * Improve openid url munging; do not display anchors and cgi parameters,
     as used by yahoo and google urls.
   * Add complete German basewiki and directives translation done by
@@ -12,10 +22,26 @@ ikiwiki (3.20100320) UNRELEASED; urgency=low
     wiki source files, such as .htaccess, that would normally be skipped
     for security or other reasons. Closes: #447267
     (Thanks to Aaron Wilson for the original patch.)
-  * Allow wrappers to be built using tcc.
   * Add support for setup files written in YAML.
-
- -- Joey Hess <joeyh@debian.org>  Sat, 13 Mar 2010 14:48:10 -0500
+  * Add --set-yaml switch for setting more complex config file options.
+  * filecheck: Fix bugs that prevented the pagespecs from matching when
+    not called by attachment plugin.
+  * Fix incorrect influence info returned by a failing link() pagespec,
+    that could lead to bad dependency handling in certian situations.
+  * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
+    if necessary for unusual install.
+  * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
+  * Allow wrappers to be built using tcc. (Workaround #452876)
+  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
+    to get the user's email address and username. (Neither is yet
+    used, but they are available in the session object now.)
+  * page.tmpl: Add Cache-Control must-revalidate to ensure that users
+    (especially of Firefox) see fresh page content.
+  * htmlscrubber: Allow colons in urls after '?'
+  * template: Search for templates in the templatedir, if they are not
+    found as pages in the wiki.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 03 Apr 2010 14:17:28 -0400
 
 ikiwiki (3.20100312) unstable; urgency=HIGH
 
diff --git a/debian/control b/debian/control
index b20f4db55..d7ce9a178 100644
--- a/debian/control
+++ b/debian/control
@@ -37,22 +37,22 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-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, libhighlight-perl,
-  po4a (>= 0.35-1), gettext
+  po4a (>= 0.35-1), gettext, libyaml-perl
 Conflicts: ikiwiki-plugin-table
 Replaces: ikiwiki-plugin-table
 Provides: ikiwiki-plugin-table
 Description: a wiki compiler
- ikiwiki converts a directory full of wiki pages into HTML pages suitable
+ Ikiwiki converts a directory full of wiki pages into HTML pages suitable
  for publishing on a website. Unlike many wikis, ikiwiki does not have its
  own ad-hoc means of storing page history, and instead uses a revision control
  system such as Subversion or Git.
  .
- ikiwiki implements all of the other standard features of a wiki, including
+ Ikiwiki implements all of the other standard features of a wiki, including
  web-based page editing, user registration and logins, a RecentChanges
  page, BackLinks, search, Discussion pages, tags, smart merging and conflict
  resolution, and page locking.
  .
- ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
+ Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
  ikiwiki provides a plugin system which allows many other features to be
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.
diff --git a/debian/postinst b/debian/postinst
index bf1825ab7..8eac26361 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,7 +4,7 @@ set -e
 
 # Change this when some incompatible change is made that requires
 # rebuilding all wikis.
-firstcompat=3.20091010
+firstcompat=3.20100406
 
 if [ "$1" = configure ] && \
    dpkg --compare-versions "$2" lt "$firstcompat"; then