From: cristy Date: Sun, 28 Nov 2010 22:23:27 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8438 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dbd5a30d7785f6051f8342d82a9c03a838464ef;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index ecabc32e4..1d8116d97 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.6 -%global Patchlevel 2 +%global Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index fc5192d0e..0f19450af 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 9a3001e17..242009877 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.6-2 +# Generated automatically by config.status (ImageMagick) 6.6.6-1 # 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/coder.c b/magick/coder.c index e636c2991..1e898df25 100644 --- a/magick/coder.c +++ b/magick/coder.c @@ -152,7 +152,7 @@ static const CoderMapInfo { "M4V", "MPEG" }, { "M", "RAW" }, { "MNG", "PNG" }, - { "MOV", "PNG" }, + { "MOV", "MPEG" }, { "MP4", "MPEG" }, { "MPG", "MPEG" }, { "MPRI", "MPR" }, diff --git a/magick/version.h b/magick/version.h index c6ab2f62d..5b7f48c3e 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x666 #define MagickLibVersionText "6.6.6" #define MagickLibVersionNumber 4,0,0 -#define MagickLibAddendum "-2" +#define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2010-11-28" diff --git a/version.sh b/version.sh index fd86b8c84..58a1405e3 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.6' PACKAGE_LIB_VERSION="0x666" -PACKAGE_RELEASE="2" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,6,6,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"