From caf5c811ac27e57c28b599e76f7f71758e572bc9 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 11 Sep 2011 01:06:33 +0000 Subject: [PATCH] --- MagickCore/version.h | 6 +++--- Makefile.in | 8 ++++---- version.sh | 21 +++++++-------------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 58bd13ffb..f4eaaa4f9 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -30,10 +30,10 @@ extern "C" { #define MagickSVNRevision "5245" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" -#define MagickLibVersionNumber 5,0,0 +#define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" -#define MagickLibInterface 5 -#define MagickLibMinInterface 5 +#define MagickLibInterface 7 +#define MagickLibMinInterface 7 #define MagickReleaseDate "2011-09-10" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/Makefile.in b/Makefile.in index 9a86630dd..24d35a259 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2274,8 +2274,8 @@ am__remove_distdir = \ { test ! -d "$(distdir)" \ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr "$(distdir)"; }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 \ - $(distdir).tar.lzma $(distdir).tar.xz $(distdir).zip +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz \ + $(distdir).zip GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -2644,7 +2644,7 @@ top_srcdir = @top_srcdir@ type_include_files = @type_include_files@ windows_font_dir = @windows_font_dir@ xml2_config = @xml2_config@ -AUTOMAKE_OPTIONS = 1.11 subdir-objects parallel-tests color-tests dist-zip dist-bzip2 dist-xz dist-lzma foreign +AUTOMAKE_OPTIONS = 1.11 subdir-objects parallel-tests color-tests dist-zip dist-bzip2 dist-xz foreign topincludedir = @includedir@/ImageMagick # -I$(srcdir) is needed for user that built libltdl with a sub-Automake @@ -11178,6 +11178,7 @@ dist-gzip: distdir dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) + dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) @@ -11200,7 +11201,6 @@ dist-zip: distdir dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) diff --git a/version.sh b/version.sh index 8ace302e3..6c653e716 100644 --- a/version.sh +++ b/version.sh @@ -29,19 +29,12 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print PACKAGE_VERSION_ADDENDUM="-${PACKAGE_RELEASE}" # -# Libtool library revision control info: See the libtool documentation under -# the heading "Libtool's versioning system" in order to understand the meaning -# of these fields. -# -# Here are a set of rules to help you update your library version -# information: -# -# If there is any interface change, increment CURRENT (major). If that -# interface change does not break upward compatibility (i.e. it is an -# addition), increment AGE (micro), Otherwise AGE is reset to 0. If CURRENT -# has changed, REVISION (minor) is set to 0, otherwise REVISION is -# incremented. - -MAGICK_LIBRARY_CURRENT=5 +# Versions are denoted using a standard triplet of integers: +# MAJOR.MINOR.PATCH. The basic intent is that MAJOR versions are +# incompatible, large-scale upgrades of the API. MINOR versions retain +# source and binary compatibility with older minor versions, and changes +# in the PATCH level are perfectly compatible, forwards and backwards. +# See http://apr.apache.org/versioning.html. +MAGICK_LIBRARY_CURRENT=7 MAGICK_LIBRARY_REVISION=0 MAGICK_LIBRARY_AGE=0 -- 2.40.0