diff options
| -rw-r--r-- | IkiWiki/Plugin/img.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | doc/logo.mdwn | 2 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 120326910..2a6533e39 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -6,7 +6,6 @@ package IkiWiki::Plugin::img; use warnings; use strict; use IkiWiki; -use Image::Magick; my %imgdefaults; @@ -37,6 +36,9 @@ sub preprocess (@) { #{{{ my $dir = IkiWiki::dirname($file); my $base = IkiWiki::basename($file); + + eval q{use Image::Magick}; + error($@) if $@; my $im = Image::Magick->new; my $imglink; my $r; diff --git a/debian/changelog b/debian/changelog index a439ab32f..b51b7b441 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ikiwiki (1.44) UNRELEASED; urgency=low those dreaded "Read more" links in blogs. * Don't error out if estcmd fails, just print a warning message. estcmd is to fragile to let it kill ikiwiki. + * Make img plugin not fail immediately if Image::Magick is not available. + This lets ikiwiki not build depend on perlmagic. -- Joey Hess <joeyh@debian.org> Mon, 19 Feb 2007 22:12:25 -0500 diff --git a/debian/control b/debian/control index 66776391b..08c665222 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, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick +Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl Maintainer: Joey Hess <joeyh@debian.org> Standards-Version: 3.7.2 XS-Vcs-Svn: svn://svn.kitenet.net/ikiwiki/trunk diff --git a/doc/logo.mdwn b/doc/logo.mdwn index 62bb6f51a..0a0162713 100644 --- a/doc/logo.mdwn +++ b/doc/logo.mdwn @@ -27,8 +27,6 @@ added). Some other alternate icons and buttons are also included in the svg file and can be extracted by specifying their names. - [[img ikiwiki.png alt="bob" size="200x200"]] - Contributed by Recai Oktaş * [[ikiwiki_logo|ikiwiki_old2.png]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index c9db3be99..340a84760 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-19 21:47-0500\n" +"POT-Creation-Date: 2007-02-19 22:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |