X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e1c0576029f2f87b77887fe499c700ca8974ae9b..c566e16d9ee1d925626b24bb84f497ffba88986a:/debian/changelog

diff --git a/debian/changelog b/debian/changelog
index e8201bfc4..7a0e362d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
-ikiwiki (1.40) UNRELEASED; urgency=low
+ikiwiki (1.41) UNRELEASED; urgency=low
+
+  * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
+    if an older version is installed, just don't gettext strings, instead of
+    crashing.
+  * Added smileys for Moin Moin compatability.
+  * Fix handling of discussion links on discussion pages when l10n is used.
+  * Make gitorigin_branch and gitmaster_branch configurable via the setup
+    file. Closes: #408599
+  * French translation update. Closes: #408593
+  * Improve use of svn merge, by specifying the file to merge, rather than
+    chdiring to the srcdir (which wasn't right when merging in a subdir).
+    Thanks Ethan.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 27 Jan 2007 19:01:27 -0500
+
+ikiwiki (1.40) unstable; urgency=low
 
   * Fix missing categories in rss/atom feeds.
+  * Add French translation by Jean-Luc Coulon. Closes: #406881
+  * Fix bogus use of CDATA in atom feeds. Closes: #406898
 
- -- Joey Hess <joeyh@debian.org>  Sun, 14 Jan 2007 15:09:49 -0500
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Jan 2007 21:42:27 -0500
 
 ikiwiki (1.39) unstable; urgency=low