From: Cristy Date: Thu, 27 Dec 2018 16:40:54 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.8-22~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17cc8cb1860126ccf00d065d321b94797831bb43;p=imagemagick ... --- diff --git a/configure b/configure index 0488825ba..37556a147 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.8-21. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-22. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.8-21' -PACKAGE_STRING='ImageMagick 7.0.8-21' +PACKAGE_VERSION='7.0.8-22' +PACKAGE_STRING='ImageMagick 7.0.8-22' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -1852,7 +1852,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.8-21 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.8-22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1927,7 +1927,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.8-21:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.8-22:";; esac cat <<\_ACEOF @@ -2219,7 +2219,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.8-21 +ImageMagick configure 7.0.8-22 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3270,7 +3270,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.8-21, which was +It was created by ImageMagick $as_me 7.0.8-22, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4256,7 +4256,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.8-21' + VERSION='7.0.8-22' cat >>confdefs.h <<_ACEOF @@ -4566,11 +4566,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=8 -MAGICK_PATCHLEVEL_VERSION=21 +MAGICK_PATCHLEVEL_VERSION=22 -MAGICK_VERSION=7.0.8-21 +MAGICK_VERSION=7.0.8-22 -MAGICK_GIT_REVISION=15176:9ef63ad7d:20181226 +MAGICK_GIT_REVISION=15183:49e6c5215:20181227 # Substitute library versioning @@ -37772,7 +37772,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.8-21, which was +This file was extended by ImageMagick $as_me 7.0.8-22, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -37839,7 +37839,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.8-21 +ImageMagick config.status 7.0.8-22 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f01cc0718..83efe7d50 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], [8]) -m4_define([magick_patchlevel_version], [21]) +m4_define([magick_patchlevel_version], [22]) 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.sh .) | awk '{ print \$1 }' | tr -d '\n'"])) diff --git a/version.sh b/version.sh index e4dcdddf3..1ff957f23 100644 --- a/version.sh +++ b/version.sh @@ -19,7 +19,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.8' PACKAGE_PERL_VERSION='7.0.8' PACKAGE_LIB_VERSION="0x708" -PACKAGE_RELEASE="21" +PACKAGE_RELEASE="22" PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}"