(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index f6ff17b7c64c60476fdd502cd404935b0bea0f5f..371d179e5777db60bbb986a7d48ec2164fae1e17 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.8
-%global Patchlevel  10
+%global Patchlevel  9
 
 Name:           ImageMagick
 Version:        %{VERSION}
@@ -259,9 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libMagickWand.so.4*
 %{_bindir}/[a-z]*
 %{_sysconfdir}/%{name}-%{VERSION}
-%{_localstatedir}/lib/%{name}-%{VERSION}
 %{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
+%{_docdir}/%{name}-%{VERSION}
 %{_mandir}/man[145]/[a-zA-Z]*
 %{_mandir}/man1/%{name}.*
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*

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

diff --git a/Makefile.in b/Makefile.in
index aa47c24aeee5d432d4de0ba300fbfdb248cca0f8..fbe021b6709f659ef2869fc71567fb4e47d76806 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2305,6 +2305,7 @@ DLLDFLAGS = @DLLDFLAGS@
 DLLTOOL = @DLLTOOL@
 DNGDecodeDelegate = @DNGDecodeDelegate@
 DOCUMENTATION_PATH = @DOCUMENTATION_PATH@
+DOC_DIR = @DOC_DIR@
 DPS_LIBS = @DPS_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 162d1d4d9c21b7c2c5a0954d3bf8931ccffca8ad..21bcc9d32f3a559e1a19bf548865c3e8917302f0 100644 (file)
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -109,7 +109,7 @@ It was originally developed to be used by CGI scripts for Web pages.
 
 A web page has been set up for this extension. See:
 
-        file:///usr/local/share/doc/ImageMagick-6.6.8/www/perl-magick.html
+        file:///usr/local/share/doc/ImageMagick-6.6.8//www/perl-magick.html
         http://www.imagemagick.org/script/perl-magick.php
 
 If you have problems, go to

diff --git a/config/configure.xml b/config/configure.xml
index d464dff8a08f5cc087724f7e8d8c7b2e001a3f14..674686d6431c8fd8ea4688b88701320a6f0b6f77 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.8"/>
   <configure name="LIB_VERSION" value="0x668"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,8,10"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,8,9"/>
   <configure name="RELEASE_DATE" value="2011-03-26"/>
   <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/var/lib/ImageMagick-6.6.8/"/>
+  <configure name="CONFIGURE_PATH" value="/usr/local/share/ImageMagick-6.6.8/"/>
   <configure name="SHARE_CONFIGURE_PATH" value="/usr/local/etc/ImageMagick-6.6.8"/>
-  <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.6.8"/>
+  <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.6.8/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.6.8"/>
   <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-6.6.8"/>

diff --git a/configure b/configure
index c15735c50cda549c89452bd36fcc2c6d5bd39be9..c04ae77ab781ec1ac7c0e55d5c2308838de9a007 100755 (executable)
--- a/configure
+++ b/configure
@@ -573,7 +573,7 @@ MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='ImageMagick'
-PACKAGE_TARNAME='ImageMagick'
+PACKAGE_TARNAME='ImageMagick-6.6.8'
 PACKAGE_VERSION='6.6.8'
 PACKAGE_STRING='ImageMagick 6.6.8'
 PACKAGE_BUGREPORT='http://www.imagemagick.org'
@@ -959,6 +959,7 @@ LIB_DIR
 LOCALSTATE_DIR
 SHAREDSTATE_DIR
 SYSCONF_DIR
+DOC_DIR
 DATA_DIR
 LIBEXEC_DIR
 SBIN_DIR
@@ -1756,7 +1757,8 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/ImageMagick]
+  --docdir=DIR            documentation root
+                          [DATAROOTDIR/doc/ImageMagick-6.6.8]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -3996,6 +3998,8 @@ eval "eval LIBEXEC_DIR=$libexecdir"
 
 eval "eval DATA_DIR=$datadir"
 
+eval "eval DOC_DIR=$docdir"
+
 eval "eval SYSCONF_DIR=$sysconfdir"
 
 eval "eval SHAREDSTATE_DIR=$sharedstatedir"
@@ -30382,8 +30386,8 @@ cat >>confdefs.h <<_ACEOF
 #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
 _ACEOF
 
-CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
@@ -30442,9 +30446,9 @@ _ACEOF
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
-DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
+DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`

diff --git a/configure.ac b/configure.ac
index a28557762794b8229b62fa55bd656608ec72c610..0ecaea585828f164a563b6d97abbc4b3a60c0219 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ m4_define([magick_micro_version], [8])
 m4_define([magick_version],
           [magick_major_version.magick_minor_version.magick_micro_version])
 
-AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick])
+AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick-magick_version])
 AC_CONFIG_SRCDIR([magick/MagickCore.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
@@ -189,6 +189,8 @@ eval "eval LIBEXEC_DIR=$libexecdir"
 AC_SUBST(LIBEXEC_DIR)
 eval "eval DATA_DIR=$datadir"
 AC_SUBST(DATA_DIR)
+eval "eval DOC_DIR=$docdir"
+AC_SUBST(DOC_DIR)
 eval "eval SYSCONF_DIR=$sysconfdir"
 AC_SUBST(SYSCONF_DIR)
 eval "eval SHAREDSTATE_DIR=$sharedstatedir"
@@ -2709,8 +2711,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}/lib/${CONFIGURE_RELATIVE_PATH}/"
-DEFINE_CONFIGURE_PATH="${LOCALSTATE_DIR}/lib/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+DEFINE_CONFIGURE_PATH="${DATA_DIR}/${CONFIGURE_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_CONFIGURE_PATH=`$WinPathScript "$DEFINE_CONFIGURE_PATH" 1`
@@ -2749,9 +2751,9 @@ AC_SUBST(FILTER_PATH)
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
-DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
+DOCUMENTATION_RELATIVE_PATH=""
+DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
+DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in
   mingw* )
     DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1`

diff --git a/libtool b/libtool
index 4aca3ff78a18a15e8fe74a9557a58e2d904715a0..b59692efd87ad1bf0e0c4c6df0ef17719ece1453 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.8-10
+# Generated automatically by config.status (ImageMagick) 6.6.8-9
 # 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 51e2642aa4bd86f7bc5d84212eaa832038f4054e..41f3d2a48854cc20ae5de55f3187925fd0a35a2b 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/lib/ImageMagick-6.6.8/"
+#define MAGICKCORE_CONFIGURE_PATH "/usr/local/share/ImageMagick-6.6.8/"
 #endif
 
 /* Subdirectory of lib where architecture-dependent configuration files live.
@@ -58,7 +58,7 @@
 
 /* Directory where ImageMagick documents live. */
 #ifndef MAGICKCORE_DOCUMENTATION_PATH
-#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.6.8/"
+#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.6.8//"
 #endif
 
 /* Define if you have Display Postscript */
@@ -1181,7 +1181,7 @@
 
 /* Define to the one symbol short name of this package. */
 #ifndef MAGICKCORE_PACKAGE_TARNAME
-#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick"
+#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick-6.6.8"
 #endif
 
 /* Define to the home page for this package. */

diff --git a/magick/version.h b/magick/version.h
index a7a34749978e327c4ed7ca8fe33506145a78002d..630d147da126eb05cf54c40412f5c36f153e1e7a 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x668
 #define MagickLibVersionText  "6.6.8"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-10"
+#define MagickLibAddendum  "-9"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-03-26"
@@ -52,7 +52,7 @@ extern "C" {
 #define MagickHDRIFeature  " "
 #endif
 #define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature
-#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.8/index.html"
+#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.8//index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
 #define MagickQuantumDepth  "Q8"
 #define MagickQuantumRange  "255"

diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index 0343e6d85e7372f338114d6e4aa480ae1b645474..8541e821299c9f1ea407d5f5d3b825e6488924ca 100644 (file)
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -67,9 +67,9 @@ saves any visible window on an X server and outputs it as an image file. You can
 
 interprets and executes scripts written in the Magick Scripting Language (MSL).
 .PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//index.html or http://www.imagemagick.org/.
 .SH SEE ALSO
 convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/animate.1 b/utilities/animate.1
index f130253bcee623f9c51fdd8d94421aa35f2a181e..4293e9a91cf5fb5c17171666fdbfcd0951678db4 100644 (file)
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server.
 
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/animate.html or http://www.imagemagick.org/script/animate.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -93,4 +93,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/compare.1 b/utilities/compare.1
index 37a62c468fea79e0f6af29f713479a0e7c01b367..a92c7fc4ee68a013f608fc5254d639f7e821b7e4 100644 (file)
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image
 .SH OVERVIEW
 The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction.
 
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/compare.html or http://www.imagemagick.org/script/compare.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -66,4 +66,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/composite.1 b/utilities/composite.1
index 75c25d174cc39790fd28dfdd529fbc86fc039f9a..df00a8bc92a2327fbf74d54000d25bd40d87da2b 100644 (file)
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@ composite \-  overlaps one image over another.
 .SH OVERVIEW
 The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another.
 
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/composite.html or http://www.imagemagick.org/script/composite.php.
 .SH DESCRIPTION
 Image Settings:
   \-affine matrix       affine transform matrix
@@ -103,4 +103,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/conjure.1 b/utilities/conjure.1
index 0633b47dd704b9d4316111b9add40ea469462dc2..f414c354e0d6e14e7ebba368dcff664b36abc288 100644 (file)
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu
 .SH OVERVIEW
 The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
 
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/conjure.html or http://www.imagemagick.org/script/conjure.php.
 .SH DESCRIPTION
 Image Settings:
   \-monitor             monitor progress
@@ -31,4 +31,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/convert.1 b/utilities/convert.1
index 7765a4bc210a8e7383552c73173a29091bc5bd36..4edafb493ea5a3b1be61b72b04182a1c66ea7afd 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop,
 .SH OVERVIEW
 The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
 
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/convert.html or http://www.imagemagick.org/script/convert.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -266,4 +266,4 @@ By default, the image format of `file' is determined by its magic number.  To sp
 ImageMagick(1)
 
 .SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/display.1 b/utilities/display.1
index 1c6670ea9ad2e1cb21c0a0ef42fc27b85b05ead3..e8462be52f0a18432a4ef0d0761a9a921b28a29d 100644 (file)
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server.
 .SH OVERVIEW
 The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server.
 
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/display.html or http://www.imagemagick.org/script/display.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -125,4 +125,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/identify.1 b/utilities/identify.1
index 0fbe1145fe89e27b7d66421e3cf51dadf83eec46..e552292e3d0d95a189b6f4c27ccabe251d0ae39e 100644 (file)
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files.
 .SH OVERVIEW
 The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
 
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/identify.html or http://www.imagemagick.org/script/identify.php.
 .SH DESCRIPTION
 Image Settings:
   \-antialias           remove pixel-aliasing
@@ -61,4 +61,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/import.1 b/utilities/import.1
index ed15c72eebce74570e8959208f769e7a7cf03550..8f24674d80d4a71a395016b49db1eb832abf50d3 100644 (file)
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil
 .SH OVERVIEW
 The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file.
 
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/import.html or http://www.imagemagick.org/script/import.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -94,4 +94,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 4b71d05752e20b7d4904c2b4b54be67057eb152a..1d42fa69c305a4cd8b7a8e924beee6fd21f342c4 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join,
 .SH OVERVIEW
 The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
 
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -268,4 +268,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/montage.1 b/utilities/montage.1
index c11ea8acf8cc44b75798911cc6fd27301e9833c1..edf7ecae4fe35705d07000318ea9c268df137d9a 100644 (file)
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im
 .SH OVERVIEW
 The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
 
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/montage.html or http://www.imagemagick.org/script/montage.php.
 .SH DESCRIPTION
 Image Settings:
   \-adjoin              join images into a single multi-image file
@@ -131,4 +131,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/utilities/stream.1 b/utilities/stream.1
index 6bc6c8a95750dad5a5bc520c739a07ca1d521b9f..dcec95739a336a296de0ee4b814278ffb4297990 100644 (file)
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image
 .SH OVERVIEW
 \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
 
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8/www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.6.8//www/stream.html or http://www.imagemagick.org/script/stream.php.
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
@@ -54,4 +54,4 @@ ImageMagick(1)
 
 .SH COPYRIGHT
 
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8/www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.6.8//www/license.html or http://www.imagemagick.org/script/license.php\fP

diff --git a/version.sh b/version.sh
index 2ba7c2c875ec15301036cb98032c4d6dca6b3d78..4e5fa182cbea79676f54dc007b6fa58278dcc80a 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.8'
 PACKAGE_LIB_VERSION="0x668"
-PACKAGE_RELEASE="10"
+PACKAGE_RELEASE="9"
 PACKAGE_LIB_VERSION_NUMBER="6,6,8,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"