From: Cristy Date: Sat, 11 Mar 2017 18:01:43 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.5-3~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dd59b8ec14ce934d8772ff6625953b5155d61d9;p=imagemagick ... --- diff --git a/configure b/configure index e1dd59e15..1f19af5fe 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.5-2. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.5-3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.5-2' -PACKAGE_STRING='ImageMagick 7.0.5-2' +PACKAGE_VERSION='7.0.5-3' +PACKAGE_STRING='ImageMagick 7.0.5-3' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://www.imagemagick.org' @@ -1819,7 +1819,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.0.5-2 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.5-3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1894,7 +1894,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.5-2:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.5-3:";; esac cat <<\_ACEOF @@ -2168,7 +2168,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.5-2 +ImageMagick configure 7.0.5-3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3219,7 +3219,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.0.5-2, which was +It was created by ImageMagick $as_me 7.0.5-3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4205,7 +4205,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.5-2' + VERSION='7.0.5-3' cat >>confdefs.h <<_ACEOF @@ -4515,11 +4515,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=5 -MAGICK_PATCHLEVEL_VERSION=2 +MAGICK_PATCHLEVEL_VERSION=3 -MAGICK_VERSION=7.0.5-2 +MAGICK_VERSION=7.0.5-3 -MAGICK_GIT_REVISION=19674:68ea6a0:20170305 +MAGICK_GIT_REVISION=19698:ca08b05:20170311 # Substitute library versioning @@ -38249,7 +38249,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.0.5-2, which was +This file was extended by ImageMagick $as_me 7.0.5-3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38316,7 +38316,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.0.5-2 +ImageMagick config.status 7.0.5-3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0119a12be..e9bac803c 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PREREQ(2.69) m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [0]) m4_define([magick_micro_version], [5]) -m4_define([magick_patchlevel_version], [2]) +m4_define([magick_patchlevel_version], [3]) m4_define([magick_version], [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version]) m4_define([magick_git_revision], esyscmd([sh -c "(gitversion .) | tr -d '\n'"])) diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 38ea0b284..b75c98ce8 100644 --- a/utilities/ImageMagick.1 +++ b/utilities/ImageMagick.1 @@ -91,4 +91,4 @@ For more information about the ImageMagick, point your browser to file:///usr/lo convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index 6a5b371c8..456abc0fd 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -98,4 +98,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index 5387a2de1..abf0a6533 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -79,4 +79,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index f4ca21455..5ed01a6c0 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -113,4 +113,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index f14ebd4b1..482b00b91 100644 --- a/utilities/conjure.1 +++ b/utilities/conjure.1 @@ -31,4 +31,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index 9b4d24449..738360bd2 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -322,4 +322,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index b11476584..24945d92a 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -136,4 +136,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index 92df22f94..8bce29d2b 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index 1e71fb6b1..e4bc9b50f 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -96,4 +96,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/magick-script.1 b/utilities/magick-script.1 index 562f79865..30f46a1b5 100644 --- a/utilities/magick-script.1 +++ b/utilities/magick-script.1 @@ -280,4 +280,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/magick.1 b/utilities/magick.1 index dd38bee2f..021c258f1 100644 --- a/utilities/magick.1 +++ b/utilities/magick.1 @@ -277,4 +277,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index caf6f88cc..7ac57fc95 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -320,4 +320,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index 5173fd755..3fb97f43c 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -142,4 +142,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index 0d362be53..244ee4f9a 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -56,4 +56,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2017 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/version.sh b/version.sh index ef55871c4..ec18b9c23 100644 --- a/version.sh +++ b/version.sh @@ -18,7 +18,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print PACKAGE_VERSION='7.0.5' PACKAGE_PERL_VERSION='7.05' PACKAGE_LIB_VERSION="0x705" -PACKAGE_RELEASE="2" +PACKAGE_RELEASE="3" PACKAGE_LIB_VERSION_NUMBER="7,0,5,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"