* Make img plugin not fail immediately if Image::Magick is not available.

  This lets ikiwiki not build depend on perlmagic.

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 120326910988e4a2457b16268a89a79b7349e7e5..2a6533e39aa357572cdb7cc939667927f3e9e2cd 100644 (file)
--- 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 warnings;
 use strict;
 use IkiWiki;

-use Image::Magick;

 
 my %imgdefaults;
 
 
 my %imgdefaults;
 


@@ -37,6 +36,9 @@ sub preprocess (@) { #{{{
 
        my $dir = IkiWiki::dirname($file);
        my $base = IkiWiki::basename($file);
 
        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;
        my $im = Image::Magick->new;
        my $imglink;
        my $r;

diff --git a/debian/changelog b/debian/changelog
index a439ab32f569ede41e8255cfd011eedeb5495032..b51b7b4413b58fd524d816e856f32074e669ec0a 100644 (file)
--- 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.
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 19 Feb 2007 22:12:25 -0500
 

diff --git a/debian/control b/debian/control
index 66776391b8dc3f7660a371b673889acd44e045aa..08c6652220bb0b60ca23eeaee4799c3e156cbc3e 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), 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
 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 62bb6f51ac6076eead68380ff56be21a7fa68a50..0a0162713a04006e04791f77555327806a2ff210 100644 (file)
--- 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.
 
   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]]
   Contributed by Recai Oktaş
 
 * [[ikiwiki_logo|ikiwiki_old2.png]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index c9db3be99860320f98fd9d5f0e982140d8902743..340a847604843ccd1800f0487e12789a8c6362f8 100644 (file)
--- 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"
 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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"