From 96a63738e1a8fe144038d8a45c91bd44a652618e Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 6 Mar 2010 17:36:14 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- Makefile.am | 1 - Makefile.in | 7 +++---- config/configure.xml | 4 ++-- libtool | 2 +- magick/version.h | 4 ++-- tests/Makefile.am | 6 +++--- tests/common.sh | 1 + utilities/convert.1 | 4 ++-- utilities/mogrify.1 | 4 ++-- version.sh | 2 +- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 7a2a70306..742f24150 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.0 -%define Patchlevel 3 +%define Patchlevel 4 Name: ImageMagick Version: %{VERSION} diff --git a/Makefile.am b/Makefile.am index 3e350f4c7..e2e986f4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,6 @@ TESTS_ENVIRONMENT = \ IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \ MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \ VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \ - REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \ LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \ MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \ MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \ diff --git a/Makefile.in b/Makefile.in index 14e618b4f..64f7bb87a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2586,7 +2586,6 @@ TESTS_ENVIRONMENT = \ IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \ MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \ VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \ - REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \ LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \ MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \ MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \ @@ -4531,13 +4530,13 @@ TESTS_TESTS = \ tests/validate-compare.sh \ tests/validate-composite.sh \ tests/validate-convert.sh \ - tests/validate-formats-on-disk.sh \ - tests/validate-formats-in-memory.sh \ tests/validate-identify.sh \ tests/validate-import.sh \ tests/validate-montage.sh \ tests/validate-pipe.sh \ - tests/validate-stream.sh + tests/validate-stream.sh \ + tests/validate-formats-in-memory.sh \ + tests/validate-formats-on-disk.sh TESTS_EXTRA_DIST = \ tests/common.sh \ diff --git a/config/configure.xml b/config/configure.xml index 05792158b..0a31b6413 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/libtool b/libtool index d9595fb6c..eaf8b4fda 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.6.0-3 +# Generated automatically by config.status (ImageMagick) 6.6.0-4 # 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 3d5ac8c77..190393eca 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,10 +30,10 @@ extern "C" { #define MagickLibVersion 0x660 #define MagickLibVersionText "6.6.0" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-3" +#define MagickLibAddendum "-4" #define MagickLibInterface 3 #define MagickLibMinInterface 3 -#define MagickReleaseDate "2010-03-05" +#define MagickReleaseDate "2010-03-06" #define MagickChangeDate "20100305" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.0/index.html" diff --git a/tests/Makefile.am b/tests/Makefile.am index 202f7c51d..217e50355 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,13 +27,13 @@ TESTS_TESTS = \ tests/validate-compare.sh \ tests/validate-composite.sh \ tests/validate-convert.sh \ - tests/validate-formats-on-disk.sh \ - tests/validate-formats-in-memory.sh \ tests/validate-identify.sh \ tests/validate-import.sh \ tests/validate-montage.sh \ tests/validate-pipe.sh \ - tests/validate-stream.sh + tests/validate-stream.sh \ + tests/validate-formats-in-memory.sh \ + tests/validate-formats-on-disk.sh TESTS_EXTRA_DIST = \ tests/common.sh \ diff --git a/tests/common.sh b/tests/common.sh index 30b7f5333..6e6c0f5e9 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -1,5 +1,6 @@ SRCDIR=`dirname $0` SRCDIR=`cd $SRCDIR && pwd` TOPSRCDIR=`cd $srcdir && pwd` +REFERENCE_IMAGE="${TOPSRCDIR}/images/rose.pnm" export SRCDIR TOPSRCDIR cd tests || exit 1 diff --git a/utilities/convert.1 b/utilities/convert.1 index 891f0c76b..28dc9a7b6 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -231,8 +231,8 @@ Image Sequence Operators: \-flatten flatten a sequence of images \-fx expression apply mathematical expression to an image channel(s) \-hald-clut apply a Hald color lookup table to the image - \-intensity-projection - the maximum (or minimum) intensity projection + \-maximum the maximum intensity of an image sequence + \-minimum the minimum intensity of an image sequence \-morph value morph an image sequence \-mosaic create a mosaic from an image sequence \-process arguments process the image with a custom image filter diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 4aa4d7a09..97947662a 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -233,8 +233,8 @@ Image Sequence Operators: \-flatten flatten a sequence of images \-fx expression apply mathematical expression to an image channel(s) \-hald-clut apply a Hald color lookup table to the image - \-intensity-projection - the maximum (or minimum) intensity projection + \-maximum the maximum intensity of an image sequence + \-minimum the minimum intensity of an image sequence \-morph value morph an image sequence \-mosaic create a mosaic from an image sequence \-process arguments process the image with a custom image filter diff --git a/version.sh b/version.sh index b26dbcc63..c721628cf 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.0' PACKAGE_LIB_VERSION="0x660" -PACKAGE_RELEASE="3" +PACKAGE_RELEASE="4" PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" -- 2.40.0