Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/debian/changelog b/debian/changelog
index 080de759bbe6600abc12ba94be673d93dd54ef3a..e387af09561bdbd1fa7731addceb9610c9cc63c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-ikiwiki (2.46) UNRELEASED; urgency=low
+ikiwiki (2.47) UNRELEASED; urgency=low
+
+  * mdwn: Add a multimarkdown setup file option.
+  * If PERL5LIB is set to the libdir when building ikiwiki, calculate and 
+    hardcode a proper 'use lib' statement anyway. This fixes a gotcha,
+    since PERL5LIB won't work once ikiwiki is running via a wrapper or as
+    a cgi.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 13 May 2008 12:30:18 -0400
+
+ikiwiki (2.46) unstable; urgency=low
 
   * amazon_s3: New plugin, which injects wiki pages into Amazon S3, allowing
     ikiwiki to be used without a dedicated web server.
@@ -12,7 +22,7 @@ ikiwiki (2.46) UNRELEASED; urgency=low
   * Fixes for behavior changes in perl 5.10's CGI that broke utf-8 support
     in several interesting ways.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 05 May 2008 19:34:51 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 12 May 2008 20:51:50 -0400
 
 ikiwiki (2.45) unstable; urgency=low