From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 20 Nov 2006 10:29:39 +0000 (+0000)
Subject: get rid of wikiformat build dep
X-Git-Tag: 1.34~119
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b6116256c513daffe91d55a34dc134c8a43f9c8f?ds=sidebyside

get rid of wikiformat build dep
---

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 95182f870..586be0874 100644
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -5,7 +5,6 @@ package IkiWiki::Plugin::wikitext;
 use warnings;
 use strict;
 use IkiWiki;
-use Text::WikiFormat;
 
 sub import { #{{{
 	hook(type => "htmlize", id => "wiki", call => \&htmlize);
@@ -15,6 +14,8 @@ sub htmlize (@) { #{{{
 	my %params=@_;
 	my $content = $params{content};
 
+	eval q{use Text::WikiFormat};
+	return $content if $@;
 	return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}
 
diff --git a/debian/control b/debian/control
index 710e24185..041042c68 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), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libtext-wikiformat-perl, libhtml-parser-perl, liburi-perl, perlmagick
+Build-Depends-Indep: dpkg-dev (>= 1.9.0), markdown, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.kitenet.net/ikiwiki/trunk