Added reverence to graphicsmagick-im-compat

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@569 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/control b/debian/control
index ec3ab0168c5039bfdb7e5943a49a963b62dd78e5..4b03a9bb584599aefc2a16f0efc96b52901b5aab 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0
 
 Package: gosa
 Architecture: all
-Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4, php4-gd, php4-imap, php4-ldap, php4-mcrypt, php4-mhash, php4-mysql, php4-imagick | imagemagick (>= 5.4.4.5-1), fping, libcrypt-smbhash-perl, smarty
+Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4, php4-gd, php4-imap, php4-ldap, php4-mcrypt, php4-mhash, php4-mysql, php4-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty
 Suggests: cupsys-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, php4-cups, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 9d23c87f1f9b62a5926da473c953ff9c38c7b0c4..050cd69a4ff3dc982581ba5dafc4271538cde8c5 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -304,7 +304,7 @@ function perform_additional_checks(&$faults)
   $output= shell_exec ($query);
   if ($output != ""){
     $lines= split ("\n", $output);
-    $version= preg_replace ("/^Version:[^I]+ImageMagick ([^\s]+).*/", "\\1", $lines[0]);
+    $version= preg_replace ("/^Version:.+Magick ([^\s]+).*/", "\\1", $lines[0]);
     list($major, $minor)= split("\.", $version);
     $msg.= check (     $faults, _("Checking for ImageMagick (>=5.4.0)"),
         _("ImageMagick is used to convert user supplied images to fit the suggested size and the unified JPEG format."),