From: cristy Date: Sat, 2 Jul 2011 00:59:04 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7377 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a3e21569359dbcc30b6b61ef3cec2446a2e4fa5;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index b3ac424f0..c7920c8f3 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,4 +1,4 @@ -%global VERSION 6.7.1 +%global VERSION 7.0.0 %global Patchlevel 0 Name: ImageMagick diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index e8df6ce4e..66bccd34d 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -40,7 +40,7 @@ while test $# -gt 0; do echo $exec_prefix ;; --version) - echo '6.7.1 Q16 ' + echo '7.0.0 Q16 ' ;; --cflags) echo "-I${includedir} -fopenmp" diff --git a/Magick++/lib/ImageMagick++.pc b/Magick++/lib/ImageMagick++.pc index 89d867935..200118962 100644 --- a/Magick++/lib/ImageMagick++.pc +++ b/Magick++/lib/ImageMagick++.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include/ImageMagick Name: ImageMagick++ -Version: 6.7.1 +Version: 7.0.0 Description: Magick++ - C++ API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagick++ diff --git a/MagickCore/ImageMagick.pc b/MagickCore/ImageMagick.pc index d6922a923..7af081e15 100644 --- a/MagickCore/ImageMagick.pc +++ b/MagickCore/ImageMagick.pc @@ -5,6 +5,6 @@ includedir=${prefix}/include/ImageMagick Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images -Version: 6.7.1 +Version: 7.0.0 Libs: -L${libdir} -lMagickCore Cflags: -I${includedir} -fopenmp diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index d87175c01..2f9648ec3 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -34,12 +34,12 @@ /* Location of coder modules */ #ifndef MAGICKCORE_CODER_PATH -#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-6.7.1/modules-Q16/coders/" +#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-7.0.0/modules-Q16/coders/" #endif /* Subdirectory of lib where coder modules are installed */ #ifndef MAGICKCORE_CODER_RELATIVE_PATH -#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-6.7.1/modules-Q16/coders" +#define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-7.0.0/modules-Q16/coders" #endif /* Directory where architecture-dependent configuration files live. */ @@ -80,12 +80,12 @@ /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH -#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-6.7.1/modules-Q16/filters/" +#define MAGICKCORE_FILTER_PATH "/usr/local/lib/ImageMagick-7.0.0/modules-Q16/filters/" #endif /* Subdirectory of lib where filter modules are installed */ #ifndef MAGICKCORE_FILTER_RELATIVE_PATH -#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-6.7.1/modules-Q16/filters" +#define MAGICKCORE_FILTER_RELATIVE_PATH "ImageMagick-7.0.0/modules-Q16/filters" #endif /* Define if you have FONTCONFIG library */ @@ -1165,13 +1165,13 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-6.7.1/" +#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.0/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are installed */ #ifndef MAGICKCORE_LIBRARY_RELATIVE_PATH -#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-6.7.1" +#define MAGICKCORE_LIBRARY_RELATIVE_PATH "ImageMagick-7.0.0" #endif /* Define if you have LQR library */ @@ -1312,13 +1312,13 @@ /* Directory where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-6.7.1/" +#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7.0.0/" #endif /* Subdirectory of lib where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_RELATIVE_PATH -#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-6.7.1" +#define MAGICKCORE_SHARE_RELATIVE_PATH "ImageMagick-7.0.0" #endif /* The size of `off_t', as computed by sizeof. */ diff --git a/MagickCore/version.h b/MagickCore/version.h index 0cd48a779..e01bb8a53 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,13 +27,13 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "4683" -#define MagickLibVersion 0x671 -#define MagickLibVersionText "6.7.1" -#define MagickLibVersionNumber 4,0,1 +#define MagickSVNRevision "4693" +#define MagickLibVersion 0x700 +#define MagickLibVersionText "7.0.0" +#define MagickLibVersionNumber 5,0,0 #define MagickLibAddendum "-0" -#define MagickLibInterface 4 -#define MagickLibMinInterface 4 +#define MagickLibInterface 5 +#define MagickLibMinInterface 5 #define MagickReleaseDate "2011-07-01" #define MagickChangeDate "20110701" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index 63b8963d8..291105b18 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -30,7 +30,7 @@ require AutoLoader; ConfigureError FatalErrorException ); -$VERSION = '6.7.1'; +$VERSION = '7.0.0'; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 0d90a576b..4854d9195 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -189,7 +189,7 @@ WriteMakefile 'AUTHOR' => 'ImageMagick Studio LLC', # Module version - 'VERSION' => '6.7.1', + 'VERSION' => '7.0.0', # Preprocessor defines 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING' diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 4124d618c..02078d03e 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -97,7 +97,7 @@ stable 2010-12-01 - 6.7.1 + 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index a70e668c3..713bf8563 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -7,21 +7,21 @@ ]> - - - - + + + + - + - - - + + + diff --git a/configure b/configure index 78c1b4fcb..82098b89c 100755 --- a/configure +++ b/configure @@ -3582,7 +3582,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=4683 +MAGICK_SVN_REVISION=4693 diff --git a/libtool b/libtool index 004342591..5631a5f26 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.7.1-0 +# Generated automatically by config.status (ImageMagick) 7.0.0-0 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. #