get rid of wikiformat build dep

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 95182f870c671a8c758e35231df93494464ad889..586be087415f23df6ea5dc66e2395d29483c5b3c 100644 (file)
--- 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 warnings;
 use strict;
 use IkiWiki;

-use Text::WikiFormat;

 
 sub import { #{{{
        hook(type => "htmlize", id => "wiki", call => \&htmlize);
 
 sub import { #{{{
        hook(type => "htmlize", id => "wiki", call => \&htmlize);


@@ -15,6 +14,8 @@ sub htmlize (@) { #{{{
        my %params=@_;
        my $content = $params{content};
 
        my %params=@_;
        my $content = $params{content};
 

+       eval q{use Text::WikiFormat};
+       return $content if $@;

        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}
 
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}
 

diff --git a/debian/control b/debian/control
index 710e24185e92995ab484ba09184ff88ebb81703c..041042c687ac250d103095f779ac011e0bf7fcf9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ikiwiki
 Section: web
 Priority: optional
 Build-Depends: perl, debhelper (>= 5)
 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
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.kitenet.net/ikiwiki/trunk