handle git-notes breakage

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

diff --git a/debian/changelog b/debian/changelog
index 2c121ef54f7a20e6c97344c60c68d864d516f6fb..6fbbe0a238a7e209f7e222e72bde95d46f87a972 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,15 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.
     (Sjoerd)
   * signinedit: Auto-disable the plugin when all authentication methods
     are disabled.

-  * lockedit: Detect if no authentication plugins are enabled, and
-    die with an error message as this configuration does not make sense.
+  * comments: Fix permalinks for comments using new conflict-free filenames.
+  * img: Support alignment of images with captions. (Giuseppe Bilotta)
+  * websetup: Fix utf-8 problems.
+  * websetup: Fix bug in array change detection.
+  * linkmap: Simplify and improve browser compatability by using an img, 
+    not object tag.
+  * git: The new git-notes feature in git 1.6.6 changes git log output
+    in a way that broke ikiwiki's parser if notes are added to commits.
+    Deal with this.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 04 Jan 2010 12:53:24 -0500
 


@@ -258,7 +265,7 @@ ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)

-  * po: New plugin<F11>, suporting translation of wiki pages using po files.
+  * po: New plugin, suporting translation of wiki pages using po files.

     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from
     (intrigeri)
   * Add build machinery to build po files to translate the underlay wikis,
   * Add further build machinery to generate translated underlays from