Change deb dependencies to list Text::Markdown before markdown, since the former...

diff --git a/debian/changelog b/debian/changelog
index f1f002cf081f045873cb362390749c8254f96cef..8c28e723813ad9f1162f8fe1f380048a2f59a084 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ ikiwiki (2.54) UNRELEASED; urgency=low
   [ Joey Hess ]
   * template: Add support for a BASENAME variable.
   * Fixes creation of pages when clicking on WikiLinks starting with "/".
+  * Change deb dependencies to list Text::Markdown before markdown, since
+    the former, while slower, has a much better html parser that avoids
+    numerous bugs.
 
  -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700
 

diff --git a/debian/control b/debian/control
index b29d5ffbb2bc95610154d0b9e74fddbd50f79429..a50c13c269563891bc20450f70af592b046fd3ac 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ikiwiki
 Section: web
 Priority: optional
 Build-Depends: perl, debhelper (>= 5)
-Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, markdown | libtext-markdown-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl
+Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Joey Hess <joeyh@debian.org>, Josh Triplett <josh@freedesktop.org>
 Standards-Version: 3.8.0

diff --git a/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn b/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
index afeaff60ef94743b0e07ee8f8b45356c44171ff1..608948466189e700b0d5647fd148c92f01f7a282 100644 (file)
--- a/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
+++ b/doc/bugs/Toc_map_and_template_plugins_do_not_play_well_together.mdwn
@@ -16,3 +16,15 @@ makes the whole wiki page be rendered as expected.
 
 Hint : in all cases, the non-interpreted markdown code is copied as-is
 in the HTML output, without any leading `<p>` or any HTML formatting.
+
+> You're using the old version of `markdown`, that is known to have a broken block
+> html parser, that will get confused if markdown is present between two
+> separate html blocks, and not format the markdown.
+> 
+> This is fixed in [[cpan Text::MarkDown]] 1.0.19. markdown 1.0.2 also
+> fixes the problem. Install either one. I'm going to make ikiwiki's
+> dependencies list Text::Markdown before markdown, since people keep
+> stumbling over this. (The downside is that the old broken markdown is
+> faster). --[[Joey]]
+
+[[done]]