From 53068b577b206ad7b2308cd1b62a0bea378abedd Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 20 May 2017 07:36:58 -0400 Subject: [PATCH] ... --- configure | 26 +++++++++++++------------- configure.ac | 2 +- utilities/compare.1 | 4 ++++ version.sh | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/configure b/configure index a35fc4508..af76c53ee 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-7. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.5-8. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.5-7' -PACKAGE_STRING='ImageMagick 7.0.5-7' +PACKAGE_VERSION='7.0.5-8' +PACKAGE_STRING='ImageMagick 7.0.5-8' 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-7 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.5-8 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-7:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.5-8:";; 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-7 +ImageMagick configure 7.0.5-8 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-7, which was +It was created by ImageMagick $as_me 7.0.5-8, 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-7' + VERSION='7.0.5-8' cat >>confdefs.h <<_ACEOF @@ -4515,11 +4515,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=5 -MAGICK_PATCHLEVEL_VERSION=7 +MAGICK_PATCHLEVEL_VERSION=8 -MAGICK_VERSION=7.0.5-7 +MAGICK_VERSION=7.0.5-8 -MAGICK_GIT_REVISION=20079:fa77e72:20170519 +MAGICK_GIT_REVISION=20082:033151d:20170520 # Substitute library versioning @@ -38454,7 +38454,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-7, which was +This file was extended by ImageMagick $as_me 7.0.5-8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38521,7 +38521,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-7 +ImageMagick config.status 7.0.5-8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4b55b1c4d..53c50a6d0 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], [7]) +m4_define([magick_patchlevel_version], [8]) 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/compare.1 b/utilities/compare.1 index 9e01178aa..02a43e0f7 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -78,6 +78,10 @@ Image Operators: Image Sequence Operators: \-crop geometry cut out a rectangular region of the image + \-write filename write images to this file + +Image Stack Operators: + \-delete indexes delete the image from the image sequence Miscellaneous Options: \-channel mask set the image channel mask diff --git a/version.sh b/version.sh index 5415594bf..1100e214b 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="7" +PACKAGE_RELEASE="8" PACKAGE_LIB_VERSION_NUMBER="7,0,5,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}" -- 2.40.0