* Conflicts/Replaces/Provides the unofficial ikiwiki-plugin-table

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

diff --git a/debian/changelog b/debian/changelog
index 04e23aae75db9641b20f38da777d2a50d7c4ed07..7a3c300741a7ced88a9fc5977fbc10de78dec293 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,15 @@ ikiwiki (1.50) UNRELEASED; urgency=low
   * Add a new %destsources hash, which maps between a destination file and
     the source page used to create it, ie it's the reverse of %renderedfiles.
   * Use %destsources in htmllink and urlto for 20-50% speedup. Thanks
-    JoshTripplett for the idea.
+    Josh Triplett for the idea.
+  * Optimise displaytime, trimming maybe 6% off the build time.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 09 Apr 2007 21:09:32 -0400
+  [ Josh Triplett ]
+  * Conflicts/Replaces/Provides the unofficial ikiwiki-plugin-table
+    package, because ikiwiki now provides the table plugin, and thus has
+    a file overlap with ikiwiki-plugin-table.
+
+ -- Josh Triplett <josh@freedesktop.org>  Mon, 09 Apr 2007 23:46:18 -0700
 
 ikiwiki (1.49) unstable; urgency=low