(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 2f4aaa7b4045a1c1d03e1d452c42f6e9e3dfff6c..d1c9b2642fcf4073e741aebddee5fbc325cd3303 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -2,8 +2,8 @@
 %global Patchlevel  0
 
 Name:           ImageMagick
-Version:        %{VERSION}.%{Patchlevel}
-Release:        3%{?dist}
+Version:        %{VERSION}
+Release:        %{Patchlevel}
 Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images.
 Group:          Applications/Multimedia
 License:        http://www.imagemagick.org/script/license.php
@@ -251,12 +251,11 @@ rm -rf %{buildroot}
 %{_libdir}/libMagickWand.so*
 %{_bindir}/[a-z]*
 %{_libdir}/%{name}-%{VERSION}
-%{_sysconfdir}/%{name}
-%{_libdir}/%{name}-%{VERSION}
 %{_datadir}/%{name}-%{VERSION}
-%{_mandir}/man[145]/[a-zA-Z]*
+%{_mandir}/man[145]/[a-z]*
 %{_mandir}/man1/%{name}.*
 %exclude %{_libdir}/%{name}-%{VERSION}/modules-Q16/coders/djvu.*
+%{_sysconfdir}/%{name}
 
 
 %files devel

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 57932dd4e860fffae89445d20c7fd46ad34d3e18..71a6b83452e9cec4dd852b5075ab445c1611b3dc 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7386"
+#define MagickSVNRevision  "7407"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-04-07"
+#define MagickReleaseDate  "2012-04-09"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index 79181bcb64e6c33e786fadcd8215427c43b8ca88..582d111002738f50d02bf98b965fded1a5751d77 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -105,7 +105,7 @@ MAGICKWAND_NOINST_HDRS = \
        MagickWand/script-token.h \
        MagickWand/studio.h \
        MagickWand/wand.h
-       MagickWand/wandcli-private.h \
+       MagickWand/wandcli-private.h
 
 # Headers which are installed
 MagickWandinc_HEADERS = \

diff --git a/MagickWand/operation.h b/MagickWand/operation.h
index 6726ec874b82032ab9c8cbf544159eee94ac67bc..8291681bba226684bb1ea3733f3815dee2f3f331 100644 (file)
--- a/MagickWand/operation.h
+++ b/MagickWand/operation.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#include "MagickWand//wandcli.h"
+
 extern WandExport void
   CLISettingOptionInfo(MagickCLI *,const char *,const char *, const char *),
   CLISimpleOperatorImages(MagickCLI *,const char *,const char *,const char *),

diff --git a/Makefile.in b/Makefile.in
index 6ff047753ac7cd99055080897cf364664f9af6c5..8056df617f293845798e2ea5a5abd715d6c0c394 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4418,7 +4418,6 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
-       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -4459,7 +4458,7 @@ MAGICKWAND_INCLUDE_HDRS = \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.h \
        MagickWand/stream.h \
-       MagickWand/wandcli.h
+       MagickWand/wandcli.h \
        MagickWand/wand-view.h
 
 MAGICKWAND_NOINST_HDRS = \
@@ -4469,7 +4468,6 @@ MAGICKWAND_NOINST_HDRS = \
        MagickWand/script-token.h \
        MagickWand/studio.h \
        MagickWand/wand.h
-       MagickWand/wandcli-private.h
 
 
 # Headers which are installed
@@ -7635,6 +7633,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wandcli.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/drawtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/wandtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Plo@am__quote@
@@ -11377,6 +11376,7 @@ MagickCore-install-data-local:
        $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
 MagickCore-uninstall-local:
        rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+       MagickWand/wandcli-private.h
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)
        cd $(DESTDIR)$(bindir) ; \

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 26e89a6acd3b061a4c28f79d7d14bf41dbdb2728..0ce53cf3eedb22b36132c9b97c2243eb3a49330e 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-04-07</created>
+    <created>2012-04-09</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-04-07</created>
+          <created>2012-04-09</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index 2db24496c7e83e5f0f38d90b4cf83b6e68f7472b..562ede7b8f56a7bdc4ec09eb57d9b1631aff58e6 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="7386" />
-  <configure name="RELEASE_DATE" value="2012-04-07"/>
+  <configure name="SVN_REVISION" value="7407" />
+  <configure name="RELEASE_DATE" value="2012-04-09"/>
   <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 8eb3ccc18670567d033fbba2492dd10be28177bd..9a5ce447074278969486ccb8b7a2e07890cf7758 100755 (executable)
--- a/configure
+++ b/configure
@@ -3621,7 +3621,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=7386
+MAGICK_SVN_REVISION=7407