From: cristy Date: Fri, 27 Nov 2009 21:36:31 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10332 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c54f5d497e6855cae609ea1d085fe6a63a5153ce;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 07df874f5..d9de14afd 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.8 -%define Patchlevel 1 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index c965ba753..9ddff101b 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -107,7 +107,7 @@ This Perl extension allows the reading, manipulation and writing of a large number of image file formats using the ImageMagick library. It was originally developed to be used by CGI scripts for Web pages. -A Web page has been set up for this extension. See: +A web page has been set up for this extension. See: file:///usr/local/share/doc/ImageMagick-6.5.8/www/perl-magick.html http://www.imagemagick.org/script/perl-magick.php diff --git a/config/configure.xml b/config/configure.xml index b38847bb6..3a381dc69 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/configure b/configure index b64e83438..a9e770705 100755 --- a/configure +++ b/configure @@ -21170,6 +21170,7 @@ int main () { char *data, *data2, *data3; + const char *cdata2; int i, pagesize; int fd, fd2; @@ -21194,10 +21195,10 @@ main () fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - data2 = ""; - if (write (fd2, data2, 1) != 1) + cdata2 = ""; + if (write (fd2, cdata2, 1) != 1) return 5; - data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) diff --git a/index.html b/index.html index fdf128aa8..a8c8fd1a5 100644 --- a/index.html +++ b/index.html @@ -221,7 +221,7 @@ Discourse Server • Mailing Lists • - Studio + Studio   diff --git a/libtool b/libtool index 252c5b30b..9a5b5d0c6 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-1 +# Generated automatically by config.status (ImageMagick) 6.5.8-2 # 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 0ca5062d4..aae9fa7cf 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,9 +30,9 @@ extern "C" { #define MagickLibVersion 0x658 #define MagickLibVersionText "6.5.8" #define MagickLibVersionNumber 2,0,1 -#define MagickLibSubversion "-1" -#define MagickReleaseDate "2009-11-24" -#define MagickChangeDate "20091119" +#define MagickLibSubversion "-2" +#define MagickReleaseDate "2009-11-27" +#define MagickChangeDate "20091126" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.8/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index 03721c6c0..98c1dfb5d 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="1" +PACKAGE_RELEASE="2" 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 792f4da32..7e7dde3a1 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -125,7 +125,7 @@
diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 632642a88..cd88bcf22 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -124,7 +124,7 @@