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

(cherry picked from commit a0f596b6ed4594011b07cf7af2d2d55aa78d8be1)

diff --git a/debian/changelog b/debian/changelog
index b6b9abe4b583bf73d260697154b3706889efa471..7d8daa108359812436ba38732fdba260a4200fa9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ikiwiki (2.54) UNRELEASED; urgency=low
   * ikiwiki-transition: Fix command-line processing so the prefix_directives
     transition works again.
   * 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