(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index e6f05be35c28c535e70b512d79678ac5c612c8f1..e8b0f03bd7d68dd9d570cbb74195c2bcc7fe2ec8 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMagickWand.so.4*
 %{_bindir}/[a-z]*
 %{_sysconfdir}/%{name}-%{VERSION}
-%{_localstatedir}/%{name}-%{VERSION}
+%{_localstatedir}/lib/%{name}-%{VERSION}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
 %{_mandir}/man[145]/[a-zA-Z]*

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index c24f974fe4b875a6903e66e549b937768a330065..3e1ba467e929ccc9e1ac884b0d06685b87de528d 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -259,7 +259,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMagickWand.so.4*
 %{_bindir}/[a-z]*
 %{_sysconfdir}/%{name}-%{VERSION}
-%{_localstatedir}/%{name}-%{VERSION}
+%{_localstatedir}/lib/%{name}-%{VERSION}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
 %{_mandir}/man[145]/[a-zA-Z]*

diff --git a/config/configure.xml b/config/configure.xml
index 704c56e6717efba5868541276bcba2ab001f1d47..465ebc405855d016ecfd0d98221be20fa7747e91 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x668"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,8,7"/>
-  <configure name="RELEASE_DATE" value="2011-03-21"/>
+  <configure name="RELEASE_DATE" value="2011-03-24"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 2f7d3415ebf05d8226c0172f72770279c580a98e..c15735c50cda549c89452bd36fcc2c6d5bd39be9 100755 (executable)
--- a/configure
+++ b/configure
@@ -30382,8 +30382,8 @@ cat >>confdefs.h <<_ACEOF
 #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
 _ACEOF
 
-CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`

diff --git a/configure.ac b/configure.ac
index 2aa59e6d77ce33de00d91f668b937823bfa04e69..a28557762794b8229b62fa55bd656608ec72c610 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2709,8 +2709,8 @@ AC_SUBST(LIBRARY_PATH)
 # Subdirectory to place ImageMagick configuration files
 CONFIGURE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
 AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",Subdirectory of lib where architecture-dependent configuration files live.)
-CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`

diff --git a/magick/magick-config.h b/magick/magick-config.h
index df11fbf8ae63aa9c7642ab27e0921e4517d4ffcf..51e2642aa4bd86f7bc5d84212eaa832038f4054e 100644 (file)
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -44,7 +44,7 @@
 
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
-#define MAGICKCORE_CONFIGURE_PATH "/usr/local/var/ImageMagick-6.6.8/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/local/var/lib/ImageMagick-6.6.8/"
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.

diff --git a/magick/version.h b/magick/version.h
index c30421a937542225eca9903b45fe6578305ad1b9..dd3224e59a1e7050e88fa77fee83c03f3aee703b 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-7"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-03-21"
-#define MagickChangeDate   "20110321"
+#define MagickReleaseDate  "2011-03-24"
+#define MagickChangeDate   "20110324"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/utilities/convert.1 b/utilities/convert.1
index 4e919bedc1cc8b2dcf4d31d70f6475c485510fa1..7765a4bc210a8e7383552c73173a29091bc5bd36 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -247,10 +247,10 @@ Image Sequence Operators:
   \-write filename      write images to this file
 
 Image Stack Operators:
-  \-clone index         clone an image
-  \-delete index        delete the image from the image sequence
+  \-clone indexes       clone an image
+  \-delete indexes      delete the image from the image sequence
   \-duplicate count,indexes
-                        duplicate an image one or more times
+                       duplicate an image one or more times
   \-insert index        insert last image into the image sequence
   \-swap indexes        swap two images in the image sequence
 

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 5d645aca4fb9c0b44176f9fcfb6bde29a809cd96..4b71d05752e20b7d4904c2b4b54be67057eb152a 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -249,9 +249,9 @@ Image Sequence Operators:
   \-write filename      write images to this file
 
 Image Stack Operators:
-  \-delete index        delete the image from the image sequence
+  \-delete indexes      delete the image from the image sequence
   \-duplicate count,indexes
-                        duplicate an image one or more times
+                       duplicate an image one or more times
   \-insert index        insert last image into the image sequence
   \-swap indexes        swap two images in the image sequence
 

diff --git a/utilities/montage.1 b/utilities/montage.1
index a57a6650400263ef24fdf16740dedd85752696e1..c11ea8acf8cc44b75798911cc6fd27301e9833c1 100644 (file)
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -109,8 +109,8 @@ Image Sequence Operators:
   \-coalesce            merge a sequence of images
 
 Image Stack Operators:
-  \-clone index         clone an image
-  \-delete index        delete the image from the image sequence
+  \-clone indexes       clone an image
+  \-delete indexes      delete the image from the image sequence
   \-duplicate count,indexes
                         duplicate an image one or more times
   \-insert index        insert last image into the image sequence