From: cristy Date: Mon, 9 Apr 2012 11:22:43 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5861 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e73514fe76776b662c89783d5c14c1537fa0868a;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 2f4aaa7b4..d1c9b2642 100644 --- 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 57932dd4e..71a6b8345 100644 --- 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 79181bcb6..582d11100 100644 --- 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 6726ec874..8291681bb 100644 --- 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 6ff047753..8056df617 100644 --- 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 26e89a6ac..0ce53cf3e 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-04-07 + 2012-04-09 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 stable - 2012-04-07 + 2012-04-09 7.0.0 -0 diff --git a/config/configure.xml b/config/configure.xml index 2db24496c..562ede7b8 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 8eb3ccc18..9a5ce4470 100755 --- 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