From: cristy Date: Sun, 22 Jul 2012 15:29:11 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5241 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bd4b6e6244cde4f4b32da94b433dbc872fc5667;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index 8657c867f..32c7b2815 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "8716" +#define MagickSVNRevision "8720" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-07-20" +#define MagickReleaseDate "2012-07-22" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 848b6195e..fd2adb7d8 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-07-20 + 2012-07-22 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-07-20 + 2012-07-22 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index 2f70bf9ba..19252744b 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 31b82c5eb..217802dcd 100755 --- a/configure +++ b/configure @@ -3651,7 +3651,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=8716 +MAGICK_SVN_REVISION=8720 @@ -35789,6 +35789,8 @@ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL" # Set configured scripts to executable. ac_config_commands="$ac_config_commands default" +ac_config_commands="$ac_config_commands magick.sh.in" + ac_config_commands="$ac_config_commands MagickCore-config.in" ac_config_commands="$ac_config_commands MagickWand-config.in" @@ -37164,6 +37166,7 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + "magick.sh.in") CONFIG_COMMANDS="$CONFIG_COMMANDS magick.sh.in" ;; "MagickCore-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore-config.in" ;; "MagickWand-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickWand-config.in" ;; "Magick++-config.in") CONFIG_COMMANDS="$CONFIG_COMMANDS Magick++-config.in" ;; @@ -38746,6 +38749,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX _LT_EOF ;; + "magick.sh.in":C) chmod +x magick.sh ;; "MagickCore-config.in":C) chmod +x MagickCore/MagickCore-config ;; "MagickWand-config.in":C) chmod +x MagickWand/MagickWand-config ;; "Magick++-config.in":C) chmod +x Magick++/bin/Magick++-config ;; diff --git a/configure.ac b/configure.ac index 31613964e..4c7cf837d 100755 --- a/configure.ac +++ b/configure.ac @@ -3763,6 +3763,7 @@ AC_SUBST(MAGICK_FEATURES) # Set configured scripts to executable. AC_CONFIG_COMMANDS([default],[],[]) +AC_CONFIG_COMMANDS([magick.sh.in],[chmod +x magick.sh]) AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x MagickCore/MagickCore-config]) AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-config]) AC_CONFIG_COMMANDS([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config])