Merge branch 'debian-testing'

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 25123cecc788e23282d25403a82c000e71df5d8a..b9b08050b61f8293fcb7570a2e246ecb5cf0f1df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,21 @@
-ikiwiki (3.20100723) UNRELEASED; urgency=low
+ikiwiki (3.20100816) UNRELEASED; urgency=low
+
+  * filecheck: Fall back to using the file command if the freedesktop
+    magic file cannot identify a file.
+  * flattr: New plugin. (Thanks to jaywalk for the initial implementation
+    at a flattr plugin! This one is less configurable, but simpler.)
+  * smiley: warn instead of error for missing smileys (Giuseppe Bilotta)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:45:48 -0400
+
+ikiwiki (3.20100815) unstable; urgency=medium
+
+  * Fix po test suite to not assume ikiwiki's underlay is already installed.
+    Closes: #593047
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
+
+ikiwiki (3.20100804) unstable; urgency=low
 
   * template: Fix dependency tracking. Broken in version 3.20100427.
   * po: The po_slave_languages setting is now a list, so the order of
@@ -10,8 +27,10 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
     have been disabled.
   * Use Digest::SHA built into perl rather than external Digest::SHA1
     to simplify dependencies. Closes: #591040
+  * Fixes a bug that prevented matching deleted pages when using the page()
+    PageSpec.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 04 Aug 2010 09:20:52 -0400
 
 ikiwiki (3.20100722) unstable; urgency=low