(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 14e163d5b49359302477da1d310147d1b3f85f84..193c6f72472c61e5adda7fb70b49cca33eaf4713 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.9
-%global Patchlevel  2
+%global Patchlevel  1
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 3eb7081f69319b688111f0e7ccf41b82029a94c2..99a9387f38d12adba490324216b50c9a22ac40e3 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,14 +9,14 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,9,2"/>
-  <configure name="SVN_REVISION" value="4055" />
+  <configure name="LIB_VERSION_NUMBER" value="6,6,9,1"/>
+  <configure name="SVN_REVISION" value="4079" />
   <configure name="RELEASE_DATE" value="2011-03-29"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
-  <configure name="SHARE_CONFIGURE_PATH" value="/usr/local/share/ImageMagick-6.6.9"/>
+  <configure name="SHARE_CONFIGURE_PATH" value="/usr/local/share/ImageMagick-6.6.9/config"/>
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.6.9/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.6.9"/>

diff --git a/configure b/configure
index 7d2320da85eb38987db6e0d47a59c7193471608c..52a790dc8592ec868681a12988f7245ab2fa59e3 100755 (executable)
--- a/configure
+++ b/configure
@@ -3451,7 +3451,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=4055
+MAGICK_SVN_REVISION=4079
 
 
 
@@ -30483,7 +30483,7 @@ _ACEOF
 
 
 # Subdirectory to place ImageMagick configuration files
-SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
 
 cat >>confdefs.h <<_ACEOF
 #define SHARE_CONFIGURE_RELATIVE_PATH "$SHARE_CONFIGURE_RELATIVE_PATH"

diff --git a/configure.ac b/configure.ac
index 8be418f6419da370064efd291c41ad6fa5f9654f..a4a001daf78ac2b3571bf8f8acb59fb68769c81c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2778,7 +2778,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_PATH",Directory where archi
 AC_SUBST(CONFIGURE_PATH)
 
 # Subdirectory to place ImageMagick configuration files
-SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+SHARE_CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
 AC_DEFINE_UNQUOTED(SHARE_CONFIGURE_RELATIVE_PATH,"$SHARE_CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
 SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}"
 DEFINE_SHARE_CONFIGURE_PATH="${DATA_DIR}/${SHARE_CONFIGURE_RELATIVE_PATH}/"

diff --git a/libtool b/libtool
index 76e0cf7c5d2aae97f043a9a8cd26c2945da9cb26..e55808485d42f5f671b436e9277906ca34d611b6 100755 (executable)
--- 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.9-2
+# Generated automatically by config.status (ImageMagick) 6.6.9-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/magick-config.h b/magick/magick-config.h
index 103b1462fd04ba8d8ef0af18f18b8ef35a581fcd..8d64fc3f93755b210b0e60788492ad376a9e7225 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -1236,13 +1236,13 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_CONFIGURE_PATH
-#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.9/"
+#define MAGICKCORE_SHARE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.9/config/"
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files
    live. */
 #ifndef MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH
-#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9"
+#define MAGICKCORE_SHARE_CONFIGURE_RELATIVE_PATH "ImageMagick-6.6.9/config"
 #endif
 
 /* Directory where architecture-independent files live. */

diff --git a/magick/version.h b/magick/version.h
index 42d2ea42e244ad7ee36ece7cc9049bfb1f75362f..6a4e2e17d366a60a67af579145dbfe9d504786ae 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,11 +27,11 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4055"
+#define MagickSVNRevision  "4079"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-2"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-03-29"

diff --git a/version.sh b/version.sh
index 0e2e39d030012e45faf47d6a9c39186f09f96319..d65c73db8bc7f663d0277b4046eb839741f927dd 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.6.9'
 PACKAGE_LIB_VERSION="0x669"
-PACKAGE_RELEASE="2"
+PACKAGE_RELEASE="1"
 PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"