From 8f44a98825f1dc61d9aa738220f2156c2fa7e2b2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 26 Aug 2008 12:24:47 -0400 Subject: [PATCH] Change deb dependencies to list Text::Markdown before markdown, since the former, while slower, has a much better html parser that avoids numerous bugs. (cherry picked from commit a0f596b6ed4594011b07cf7af2d2d55aa78d8be1) --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b6b9abe4b..7d8daa108 100644 --- 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 Wed, 09 Jul 2008 21:30:33 -0700 diff --git a/debian/control b/debian/control index b29d5ffbb..a50c13c26 100644 --- 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 Uploaders: Joey Hess , Josh Triplett Standards-Version: 3.8.0 -- 2.26.2