* Deal with CPAN installing Markdown as Text::Markdown, while it's

  installed as just Markdown by apt.

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index e5228c3299c5f98b3b8ac8b3cda0b2d11d4e6ce5..0fc077f5ec1cc1a30eaffba1ce8d323cccf160cf 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,8 +25,11 @@ sub htmlize (@) { #{{{
 
                eval q{use Markdown};
                if ($@) {
-                       do "/usr/bin/markdown" ||
-                               error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+                       eval q{use Text::Markdown};
+                       if ($@) {
+                               do "/usr/bin/markdown" ||
+                                       error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+                       }
                }
                $markdown_loaded=1;
                require Encode;

diff --git a/debian/changelog b/debian/changelog
index 5ed49c8e7a752265d5dfecd330cfe23f50b92c91..ee6fb6a85fdb59fe207c67ee61a603186874e4a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,10 @@ ikiwiki (1.27) UNRELEASED; urgency=low
   * pagetemplate hooks are now also called when generating cgi pages.
   * Add a favicon plugin, which simply adds a link tag for an icon to each
     page (and cgis).
+  * Deal with CPAN installing Markdown as Text::Markdown, while it's 
+    installed as just Markdown by apt.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 15 Sep 2006 19:39:36 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Sep 2006 21:13:35 -0400
 
 ikiwiki (1.26) unstable; urgency=low
 

diff --git a/doc/bugs/markdown_module_location.mdwn b/doc/bugs/markdown_module_location.mdwn
index 6534687577493655c1484a77d7276804a5078a25..e72569f35fba9416f7889bf166267d0cbdd0bc7d 100644 (file)
--- a/doc/bugs/markdown_module_location.mdwn
+++ b/doc/bugs/markdown_module_location.mdwn
@@ -8,4 +8,8 @@ the Debian markdown, which I guess you can consider a blocking bug of this.
 I tried to come up with the magical invocation to allow either location 
 to be used by ikiwiki, but I couldn't do it.
 
--- JamesWestby
\ No newline at end of file
+-- JamesWestby
+
+Fixed, I think --[[Joey]]
+
+[[bugs/done]]