From: cristy Date: Tue, 24 Nov 2009 20:52:07 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10345 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d72405f8e23115ce467e6e867693fa8d6b6dc65;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 8fca23c63..07df874f5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.8 -%define Patchlevel 0 +%define Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 8406f57eb..b38847bb6 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index fdf128aa8..305a06a7f 100644 --- a/index.html +++ b/index.html @@ -124,7 +124,7 @@
diff --git a/libtool b/libtool index fb5901a1c..252c5b30b 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.5.8-0 +# Generated automatically by config.status (ImageMagick) 6.5.8-1 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/version.h b/magick/version.h index 459e0ce29..0ca5062d4 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,8 +30,8 @@ extern "C" { #define MagickLibVersion 0x658 #define MagickLibVersionText "6.5.8" #define MagickLibVersionNumber 2,0,1 -#define MagickLibSubversion "-0" -#define MagickReleaseDate "2009-11-22" +#define MagickLibSubversion "-1" +#define MagickReleaseDate "2009-11-24" #define MagickChangeDate "20091119" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.8/index.html" diff --git a/version.sh b/version.sh index bf74b503f..03721c6c0 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.8' PACKAGE_LIB_VERSION="0x658" -PACKAGE_RELEASE="0" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,5,8,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 5d67ab243..acc77d252 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -168,7 +168,7 @@

ImageMagick provides a statically-built ImageMagick object as part of its Windows installation package. When this package is installed, ImageMagickObject and its sample programs are installed to this path:

-  c:\Program Files\ImageMagick-6.5.7-Q16\ImageMagickObject
+  c:\Program Files\ImageMagick-6.5.8-Q16\ImageMagickObject

The ImageMagickObject is registered if the checkbox, Register ImageMagickObject, is checked at install time.

@@ -211,7 +211,7 @@ Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index c025e81bd..270bfe8ee 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -124,7 +124,7 @@

Mac OS X-specific Build instructions

@@ -527,7 +527,7 @@ Options used to compile and link:

Download the ImageMagick source distribution and verify the distribution against its message digest.

Unpack and change into the top-level ImageMagick directory:

-

$magick> tar xvfz ImageMagick-6.5.7-10.tar.gz $magick> cd ImageMagick-6.5.7

Choose an architecture and set your CFLAGS environment variable. Here we set CFLAGS for an Intel build:

+

$magick> tar xvfz ImageMagick-6.5.8-0.tar.gz $magick> cd ImageMagick-6.5.8

Choose an architecture and set your CFLAGS environment variable. Here we set CFLAGS for an Intel build:

$magick> export CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.5.sdk/ \
-arch i386 -I/sw/include/"

Set your LDFLAGS environment variable to:

$magick> export LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk/,-L/sw/lib/"

Configure ImageMagick:

@@ -556,7 +556,7 @@ Options used to compile and link:

Although you can download and install delegate libraries yourself, many are already available in the GnuWin32 distribution. Download and install whichever delegate libraries you require such as JPEG, PNG, TIFF, etc. Make sure you specify the development headers when you install a package. Next type,

-

$magick> tar jxvf ImageMagick-6.5.7-?.tar.bz2 $magick> cd ImageMagick-6.5.7 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

+

$magick> tar jxvf ImageMagick-6.5.8-?.tar.bz2 $magick> cd ImageMagick-6.5.8 $magick> export CPPFLAGS="-Ic:/Progra~1/GnuWin32/include" $magick> export LDFLAGS="-Lc:/Progra~1/GnuWin32/lib" $magick> ./configure --without-perl $magick> make $magick> sudo make install

Dealing with Unexpected Problems

diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 541182b63..7c7d1016e 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -124,7 +124,7 @@