diff --git a/ImageMagick-6.6.9-5.tar.bz2 b/ImageMagick-6.6.9-5.tar.bz2
deleted file mode 100644
index c15e605..0000000
--- a/ImageMagick-6.6.9-5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b86f7672993b1498668231885f98eda7c54565464e4fe3c07c693bbf7728be1b
-size 10239024
diff --git a/ImageMagick-6.6.9-9.tar.bz2 b/ImageMagick-6.6.9-9.tar.bz2
new file mode 100644
index 0000000..7b1bf28
--- /dev/null
+++ b/ImageMagick-6.6.9-9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5db6e2fd512cec2f6889cba001720ed67b6c37ef00fc7833270a9419e5e8b685
+size 10157812
diff --git a/ImageMagick-6.6.9.1-inc-struct.diff b/ImageMagick-6.6.9.1-inc-struct.diff
index 731cf02..95dc58a 100644
--- a/ImageMagick-6.6.9.1-inc-struct.diff
+++ b/ImageMagick-6.6.9.1-inc-struct.diff
@@ -34,10 +34,11 @@ Only in old/magick: Magick-config.1
 Only in old/magick: Magick-config.in
 Only in old/magick: MagickCore-config.1
 Only in old/magick: MagickCore-config.in
-diff -U 3 -r -x '*.o.cmd' -- old/magick/MagickCore.h new/magick/MagickCore.h
---- old/magick/MagickCore.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/MagickCore.h	2011-03-31 12:25:28.362999988 +0200
-@@ -26,7 +26,7 @@
+Index: ImageMagick-6.6.9-9/magick/MagickCore.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/MagickCore.h
++++ ImageMagick-6.6.9-9/magick/MagickCore.h
+@@ -26,7 +26,7 @@ extern "C" {
  #if !defined(_MAGICKCORE_CONFIG_H)
  # define _MAGICKCORE_CONFIG_H
  # if !defined(vms) && !defined(macintosh)
@@ -46,7 +47,7 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/MagickCore.h new/magick/MagickCore.h
  # else
  #  include "magick-config.h"
  # endif
-@@ -121,88 +121,88 @@
+@@ -121,88 +121,88 @@ extern "C" {
  #if defined(MAGICKCORE_NAMESPACE_PREFIX)
  # include "magick/methods.h"
  #endif
@@ -217,15 +218,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/MagickCore.h new/magick/MagickCore.h
  
  #if defined(__cplusplus) || defined(c_plusplus)
  }
-Only in old/magick: MagickCore.pc.in
-Only in old/magick: Make.com
-Only in old/magick: Makefile.am
-Only in old/magick: PreRvIcccm.c
-Only in old/magick: PreRvIcccm.h
-Only in old/magick: accelerate.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/accelerate.h new/magick/accelerate.h
---- old/magick/accelerate.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/accelerate.h	2011-03-31 12:35:50.162999983 +0200
+Index: ImageMagick-6.6.9-9/magick/accelerate.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/accelerate.h
++++ ImageMagick-6.6.9-9/magick/accelerate.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -235,13 +231,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/accelerate.h new/magick/accelerate.h
  
  extern MagickExport MagickBooleanType
    AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
-Only in old/magick: animate-private.h
-Only in old/magick: animate.c
-Only in old/magick: animate.h
-Only in old/magick: annotate.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/annotate.h new/magick/annotate.h
---- old/magick/annotate.h	2011-01-24 15:14:53.000000000 +0100
-+++ new/magick/annotate.h	2011-03-31 12:41:21.474999983 +0200
+Index: ImageMagick-6.6.9-9/magick/annotate.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/annotate.h
++++ ImageMagick-6.6.9-9/magick/annotate.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -251,13 +244,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/annotate.h new/magick/annotate.h
  
  extern MagickExport MagickBooleanType
    AnnotateComponentGenesis(void),
-Only in old/magick: api.h
-Only in old/magick: artifact.c
-Only in old/magick: artifact.h
-Only in old/magick: attribute.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/attribute.h new/magick/attribute.h
---- old/magick/attribute.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/attribute.h	2011-03-31 13:11:20.801999982 +0200
+Index: ImageMagick-6.6.9-9/magick/attribute.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/attribute.h
++++ ImageMagick-6.6.9-9/magick/attribute.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -269,11 +259,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/attribute.h new/magick/attribute.h
  
  extern MagickExport ImageType
    GetImageType(const Image *,ExceptionInfo *);
-Only in old/magick: blob-private.h
-Only in old/magick: blob.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/blob.h new/magick/blob.h
---- old/magick/blob.h	2011-02-07 01:33:21.000000000 +0100
-+++ new/magick/blob.h	2011-03-31 13:00:10.700999982 +0200
+Index: ImageMagick-6.6.9-9/magick/blob.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/blob.h
++++ ImageMagick-6.6.9-9/magick/blob.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -285,11 +274,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/blob.h new/magick/blob.h
  
  #define MagickMaxBufferExtent  (32*8192)
  
-Only in old/magick: cache-private.h
-Only in old/magick: cache-view.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/cache-view.h new/magick/cache-view.h
---- old/magick/cache-view.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/cache-view.h	2011-03-31 13:01:34.040999983 +0200
+Index: ImageMagick-6.6.9-9/magick/cache-view.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/cache-view.h
++++ ImageMagick-6.6.9-9/magick/cache-view.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -299,10 +287,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/cache-view.h new/magick/cache-view.h
  
  typedef enum
  {
-Only in old/magick: cache.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/cache.h new/magick/cache.h
---- old/magick/cache.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/cache.h	2011-03-31 13:13:46.962999982 +0200
+Index: ImageMagick-6.6.9-9/magick/cache.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/cache.h
++++ ImageMagick-6.6.9-9/magick/cache.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -312,17 +300,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/cache.h new/magick/cache.h
  
  extern MagickExport const IndexPacket
    *GetVirtualIndexQueue(const Image *);
-Only in old/magick: cipher.c
-Only in old/magick: cipher.h
-Only in old/magick: client.c
-Only in old/magick: client.h
-Only in old/magick: coder.c
-Only in old/magick: coder.h
-Only in old/magick: color-private.h
-Only in old/magick: color.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/color.h new/magick/color.h
---- old/magick/color.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/color.h	2011-03-31 12:50:26.252999982 +0200
+Index: ImageMagick-6.6.9-9/magick/color.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/color.h
++++ ImageMagick-6.6.9-9/magick/color.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -334,16 +315,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/color.h new/magick/color.h
  
  typedef enum
  {
-Only in old/magick: colormap-private.h
-Only in old/magick: colormap.c
-Only in old/magick: colormap.h
-Only in old/magick: colorspace-private.h
-Only in old/magick: colorspace.c
-Only in old/magick: colorspace.h
-Only in old/magick: compare.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/compare.h new/magick/compare.h
---- old/magick/compare.h	2010-12-11 03:17:57.000000000 +0100
-+++ new/magick/compare.h	2011-03-31 13:14:43.609999983 +0200
+Index: ImageMagick-6.6.9-9/magick/compare.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/compare.h
++++ ImageMagick-6.6.9-9/magick/compare.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -353,16 +328,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/compare.h new/magick/compare.h
  
  typedef enum
  {
-Only in old/magick: composite-private.h
-Only in old/magick: composite.c
-Only in old/magick: composite.h
-Only in old/magick: compress.c
-Only in old/magick: compress.h
-Only in old/magick: config.h_vms
-Only in old/magick: configure.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/configure.h new/magick/configure.h
---- old/magick/configure.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/configure.h	2011-03-31 13:15:58.705999982 +0200
+Index: ImageMagick-6.6.9-9/magick/configure.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/configure.h
++++ ImageMagick-6.6.9-9/magick/configure.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -372,18 +341,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/configure.h new/magick/configure.h
  
  typedef struct _ConfigureInfo
  {
-Only in old/magick: constitute.c
-Only in old/magick: constitute.h
-Only in old/magick: decorate.c
-Only in old/magick: decorate.h
-Only in old/magick: delegate-private.h
-Only in old/magick: delegate.c
-Only in old/magick: delegate.h
-Only in old/magick: deprecate.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/deprecate.h new/magick/deprecate.h
---- old/magick/deprecate.h	2011-03-18 22:29:28.000000000 +0100
-+++ new/magick/deprecate.h	2011-03-31 13:20:03.271999984 +0200
-@@ -25,16 +25,16 @@
+Index: ImageMagick-6.6.9-9/magick/deprecate.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/deprecate.h
++++ ImageMagick-6.6.9-9/magick/deprecate.h
+@@ -25,16 +25,16 @@ extern "C" {
  #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
  
  #include <stdarg.h>
@@ -410,16 +372,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/deprecate.h new/magick/deprecate.h
  
  #if !defined(magick_attribute)
  #  if !defined(__GNUC__)
-Only in old/magick: display-private.h
-Only in old/magick: display.c
-Only in old/magick: display.h
-Only in old/magick: distort.c
-Only in old/magick: distort.h
-Only in old/magick: draw-private.h
-Only in old/magick: draw.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/draw.h new/magick/draw.h
---- old/magick/draw.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/draw.h	2011-03-31 12:44:06.299999983 +0200
+Index: ImageMagick-6.6.9-9/magick/draw.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/draw.h
++++ ImageMagick-6.6.9-9/magick/draw.h
 @@ -22,10 +22,10 @@
  extern "C" {
  #endif
@@ -435,10 +391,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/draw.h new/magick/draw.h
  
  typedef enum
  {
-Only in old/magick: effect.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/effect.h new/magick/effect.h
---- old/magick/effect.h	2011-03-29 02:51:23.000000000 +0200
-+++ new/magick/effect.h	2011-03-31 13:03:10.296999983 +0200
+Index: ImageMagick-6.6.9-9/magick/effect.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/effect.h
++++ ImageMagick-6.6.9-9/magick/effect.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -448,14 +404,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/effect.h new/magick/effect.h
  
  typedef enum
  {
-Only in old/magick: enhance.c
-Only in old/magick: enhance.h
-Only in old/magick: exception-private.h
-Only in old/magick: exception.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/exception.h new/magick/exception.h
---- old/magick/exception.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/exception.h	2011-03-31 12:55:31.478999983 +0200
-@@ -23,7 +23,7 @@
+Index: ImageMagick-6.6.9-9/magick/exception.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/exception.h
++++ ImageMagick-6.6.9-9/magick/exception.h
+@@ -23,7 +23,7 @@ extern "C" {
  #endif
  
  #include <stdarg.h>
@@ -464,15 +417,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/exception.h new/magick/exception.h
  
  typedef enum
  {
-Only in old/magick: feature.c
-Only in old/magick: feature.h
-Only in old/magick: fourier.c
-Only in old/magick: fourier.h
-Only in old/magick: fx-private.h
-Only in old/magick: fx.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/fx.h new/magick/fx.h
---- old/magick/fx.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/fx.h	2011-03-31 13:21:46.152999983 +0200
+Index: ImageMagick-6.6.9-9/magick/fx.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/fx.h
++++ ImageMagick-6.6.9-9/magick/fx.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -482,10 +430,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/fx.h new/magick/fx.h
  
  typedef enum
  {
-Only in old/magick: gem.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/gem.h new/magick/gem.h
---- old/magick/gem.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/gem.h	2011-03-31 13:22:57.528999984 +0200
+Index: ImageMagick-6.6.9-9/magick/gem.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/gem.h
++++ ImageMagick-6.6.9-9/magick/gem.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -497,21 +445,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/gem.h new/magick/gem.h
  
  extern MagickExport double
    ExpandAffine(const AffineMatrix *),
-Only in old/magick: geometry.c
-Only in old/magick: geometry.h
-Only in old/magick: hashmap.c
-Only in old/magick: hashmap.h
-Only in old/magick: histogram.c
-Only in old/magick: histogram.h
-Only in old/magick: identify.c
-Only in old/magick: identify.h
-Only in old/magick: image-private.h
-Only in old/magick: image-view.c
-Only in old/magick: image-view.h
-Only in old/magick: image.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/image.h new/magick/image.h
---- old/magick/image.h	2011-03-25 11:08:53.000000000 +0100
-+++ new/magick/image.h	2011-03-31 12:58:08.667999983 +0200
+Index: ImageMagick-6.6.9-9/magick/image.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/image.h
++++ ImageMagick-6.6.9-9/magick/image.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -521,7 +458,7 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/image.h new/magick/image.h
  
  #define OpaqueOpacity  ((Quantum) 0UL)
  #define TransparentOpacity  ((Quantum) QuantumRange)
-@@ -125,24 +125,24 @@
+@@ -125,24 +125,24 @@ typedef struct _ChromaticityInfo
      white_point;
  } ChromaticityInfo;
  
@@ -564,14 +501,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/image.h new/magick/image.h
  
  struct _Image
  {
-Only in old/magick: layer.c
-Only in old/magick: layer.h
-Only in old/magick: list.c
-Only in old/magick: list.h
-Only in old/magick: locale.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/locale_.h new/magick/locale_.h
---- old/magick/locale_.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/locale_.h	2011-03-31 13:28:40.367999982 +0200
+Index: ImageMagick-6.6.9-9/magick/locale_.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/locale_.h
++++ ImageMagick-6.6.9-9/magick/locale_.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -581,11 +514,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/locale_.h new/magick/locale_.h
  
  typedef struct _LocaleInfo
  {
-Only in old/magick: log.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/log.h new/magick/log.h
---- old/magick/log.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/log.h	2011-03-31 13:30:00.926999982 +0200
-@@ -23,7 +23,7 @@
+Index: ImageMagick-6.6.9-9/magick/log.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/log.h
++++ ImageMagick-6.6.9-9/magick/log.h
+@@ -23,7 +23,7 @@ extern "C" {
  #endif
  
  #include <stdarg.h>
@@ -594,14 +527,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/log.h new/magick/log.h
  
  #if !defined(GetMagickModule)
  # define GetMagickModule()  __FILE__,__func__,(unsigned long) __LINE__
-Only in old/magick: mac.c
-Only in old/magick: mac.h
-Only in old/magick: magic.c
-Only in old/magick: magic.h
-Only in old/magick: magick-config.h
-diff -U 3 -r -x '*.o.cmd' -- old/magick/magick-type.h new/magick/magick-type.h
---- old/magick/magick-type.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/magick-type.h	2011-03-31 12:28:39.428999985 +0200
+Index: ImageMagick-6.6.9-9/magick/magick-type.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/magick-type.h
++++ ImageMagick-6.6.9-9/magick/magick-type.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -611,21 +540,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/magick-type.h new/magick/magick-type.h
  
  #if !defined(MAGICKCORE_QUANTUM_DEPTH)
  #define MAGICKCORE_QUANTUM_DEPTH  16
-Only in old/magick: magick.c
-Only in old/magick: magick.h
-Only in old/magick: matrix.c
-Only in old/magick: matrix.h
-Only in old/magick: memory.c
-Only in old/magick: memory_.h
-Only in old/magick: methods.h
-Only in old/magick: mime-private.h
-Only in old/magick: mime.c
-Only in old/magick: mime.h
-Only in old/magick: module.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/module.h new/magick/module.h
---- old/magick/module.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/module.h	2011-03-31 13:31:08.974999982 +0200
-@@ -23,7 +23,7 @@
+Index: ImageMagick-6.6.9-9/magick/module.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/module.h
++++ ImageMagick-6.6.9-9/magick/module.h
+@@ -23,7 +23,7 @@ extern "C" {
  #endif
  
  #include <time.h>
@@ -634,16 +553,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/module.h new/magick/module.h
  
  #define MagickImageCoderSignature  ((size_t) \
    (((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
-Only in old/magick: monitor-private.h
-Only in old/magick: monitor.c
-Only in old/magick: monitor.h
-Only in old/magick: montage.c
-Only in old/magick: montage.h
-Only in old/magick: morphology-private.h
-Only in old/magick: morphology.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/morphology.h new/magick/morphology.h
---- old/magick/morphology.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/morphology.h	2011-03-31 12:38:49.826999983 +0200
+Index: ImageMagick-6.6.9-9/magick/morphology.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/morphology.h
++++ ImageMagick-6.6.9-9/magick/morphology.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -653,16 +566,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/morphology.h new/magick/morphology.h
  
  typedef enum
  {
-Only in old/magick: nt-base.c
-Only in old/magick: nt-base.h
-Only in old/magick: nt-feature.c
-Only in old/magick: nt-feature.h
-Only in old/magick: option.c
-Only in old/magick: option.h
-Only in old/magick: paint.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/paint.h new/magick/paint.h
---- old/magick/paint.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/paint.h	2011-03-31 13:32:55.811999983 +0200
+Index: ImageMagick-6.6.9-9/magick/paint.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/paint.h
++++ ImageMagick-6.6.9-9/magick/paint.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -674,11 +581,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/paint.h new/magick/paint.h
  
  extern MagickExport Image
    *OilPaintImage(const Image *,const double,ExceptionInfo *);
-Only in old/magick: pixel-private.h
-Only in old/magick: pixel.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/pixel.h new/magick/pixel.h
---- old/magick/pixel.h	2011-03-26 03:10:53.000000000 +0100
-+++ new/magick/pixel.h	2011-03-31 12:51:58.086999983 +0200
+Index: ImageMagick-6.6.9-9/magick/pixel.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/pixel.h
++++ ImageMagick-6.6.9-9/magick/pixel.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -688,12 +594,12 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/pixel.h new/magick/pixel.h
 +#include "colorspace.h"
 +#include "constitute.h"
  
- #define ClampRedPixelComponent(p) ClampToQuantum((p)->red)
- #define ClampGreenPixelComponent(p) ClampToQuantum((p)->green)
-Only in old/magick: policy.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/policy.h new/magick/policy.h
---- old/magick/policy.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/policy.h	2011-03-31 13:34:07.600999982 +0200
+ #define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
+ #define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
+Index: ImageMagick-6.6.9-9/magick/policy.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/policy.h
++++ ImageMagick-6.6.9-9/magick/policy.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -705,12 +611,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/policy.h new/magick/policy.h
  
  typedef enum
  {
-Only in old/magick: prepress.c
-Only in old/magick: prepress.h
-Only in old/magick: profile.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/profile.h new/magick/profile.h
---- old/magick/profile.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/profile.h	2011-03-31 13:04:38.757999982 +0200
+Index: ImageMagick-6.6.9-9/magick/profile.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/profile.h
++++ ImageMagick-6.6.9-9/magick/profile.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -720,12 +624,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/profile.h new/magick/profile.h
  
  typedef struct _ProfileInfo
  {
-Only in old/magick: property.c
-Only in old/magick: property.h
-Only in old/magick: quantize.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/quantize.h new/magick/quantize.h
---- old/magick/quantize.h	2011-02-09 16:12:01.000000000 +0100
-+++ new/magick/quantize.h	2011-03-31 13:19:00.915999982 +0200
+Index: ImageMagick-6.6.9-9/magick/quantize.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/quantize.h
++++ ImageMagick-6.6.9-9/magick/quantize.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -735,13 +637,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/quantize.h new/magick/quantize.h
  
  typedef enum
  {
-Only in old/magick: quantum-export.c
-Only in old/magick: quantum-import.c
-Only in old/magick: quantum-private.h
-Only in old/magick: quantum.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/quantum.h new/magick/quantum.h
---- old/magick/quantum.h	2010-08-23 15:37:35.000000000 +0200
-+++ new/magick/quantum.h	2011-03-31 13:08:37.374999983 +0200
+Index: ImageMagick-6.6.9-9/magick/quantum.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/quantum.h
++++ ImageMagick-6.6.9-9/magick/quantum.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -751,11 +650,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/quantum.h new/magick/quantum.h
  
  #define RoundToQuantum(quantum)  ClampToQuantum(quantum)
  
-Only in old/magick: random-private.h
-Only in old/magick: random.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/random_.h new/magick/random_.h
---- old/magick/random_.h	2011-02-25 03:43:54.000000000 +0100
-+++ new/magick/random_.h	2011-03-31 13:24:51.373999982 +0200
+Index: ImageMagick-6.6.9-9/magick/random_.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/random_.h
++++ ImageMagick-6.6.9-9/magick/random_.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -765,13 +663,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/random_.h new/magick/random_.h
  
  /*
    Typedef declarations.
-Only in old/magick: registry.c
-Only in old/magick: registry.h
-Only in old/magick: resample-private.h
-Only in old/magick: resample.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/resample.h new/magick/resample.h
---- old/magick/resample.h	2011-03-26 01:21:26.000000000 +0100
-+++ new/magick/resample.h	2011-03-31 13:10:02.794999984 +0200
+Index: ImageMagick-6.6.9-9/magick/resample.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/resample.h
++++ ImageMagick-6.6.9-9/magick/resample.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -781,36 +676,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/resample.h new/magick/resample.h
  
  /*
    WARNING:  The order of this table must also match the order of a table
-Only in old/magick: resize-private.h
-Only in old/magick: resize.c
-Only in old/magick: resize.h
-Only in old/magick: resource.c
-Only in old/magick: resource_.h
-Only in old/magick: segment.c
-Only in old/magick: segment.h
-Only in old/magick: semaphore-private.h
-Only in old/magick: semaphore.c
-Only in old/magick: semaphore.h
-Only in old/magick: shear.c
-Only in old/magick: shear.h
-Only in old/magick: signature-private.h
-Only in old/magick: signature.c
-Only in old/magick: signature.h
-Only in old/magick: splay-tree.c
-Only in old/magick: splay-tree.h
-Only in old/magick: static.c
-Only in old/magick: static.h
-Only in old/magick: statistic.c
-Only in old/magick: statistic.h
-Only in old/magick: stream-private.h
-Only in old/magick: stream.c
-Only in old/magick: stream.h
-Only in old/magick: string-private.h
-Only in old/magick: string.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/string_.h new/magick/string_.h
---- old/magick/string_.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/string_.h	2011-03-31 13:06:47.113999983 +0200
-@@ -24,7 +24,7 @@
+Index: ImageMagick-6.6.9-9/magick/string_.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/string_.h
++++ ImageMagick-6.6.9-9/magick/string_.h
+@@ -24,7 +24,7 @@ extern "C" {
  
  #include <stdarg.h>
  #include <time.h>
@@ -819,34 +689,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/string_.h new/magick/string_.h
  
  typedef struct _StringInfo
  {
-Only in old/magick: studio.h
-Only in old/magick: thread-private.h
-Only in old/magick: thread.c
-Only in old/magick: thread_.h
-Only in old/magick: threshold.c
-Only in old/magick: threshold.h
-Only in old/magick: timer.c
-Only in old/magick: timer.h
-Only in old/magick: token-private.h
-Only in old/magick: token.c
-Only in old/magick: token.h
-Only in old/magick: transform.c
-Only in old/magick: transform.h
-Only in old/magick: type.c
-Only in old/magick: type.h
-Only in old/magick: utility.c
-Only in old/magick: utility.h
-Only in old/magick: version.c
-Only in old/magick: version.h
-Only in old/magick: version.h.in
-Only in old/magick: vms.c
-Only in old/magick: vms.h
-Only in old/magick: widget.c
-Only in old/magick: widget.h
-Only in old/magick: xml-tree.c
-diff -U 3 -r -x '*.o.cmd' -- old/magick/xml-tree.h new/magick/xml-tree.h
---- old/magick/xml-tree.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/magick/xml-tree.h	2011-03-31 13:35:32.189999983 +0200
+Index: ImageMagick-6.6.9-9/magick/xml-tree.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/magick/xml-tree.h
++++ ImageMagick-6.6.9-9/magick/xml-tree.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -858,23 +704,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/magick/xml-tree.h new/magick/xml-tree.h
  
  typedef struct _XMLTreeInfo
    XMLTreeInfo;
-Only in old/magick: xwdfile.h_vms
-Only in old/magick: xwindow-private.h
-Only in old/magick: xwindow.c
-Only in old/magick: xwindow.h
-Only in old: magick.sh.in
-Only in old: scenes
-Only in old: scripts
-Only in old: tests
-Only in old: utilities
-Only in old: version.sh
-Only in old/wand: ChangeLog
-Only in old/wand: MagickWand-config.1
-Only in old/wand: MagickWand-config.in
-diff -U 3 -r -x '*.o.cmd' -- old/wand/MagickWand.h new/wand/MagickWand.h
---- old/wand/MagickWand.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/wand/MagickWand.h	2011-03-31 13:51:32.821999982 +0200
-@@ -26,7 +26,7 @@
+Index: ImageMagick-6.6.9-9/wand/MagickWand.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/wand/MagickWand.h
++++ ImageMagick-6.6.9-9/wand/MagickWand.h
+@@ -26,7 +26,7 @@ extern "C" {
  #if !defined(_MAGICKWAND_CONFIG_H)
  # define _MAGICKWAND_CONFIG_H
  # if !defined(vms) && !defined(macintosh)
@@ -883,7 +717,7 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/MagickWand.h new/wand/MagickWand.h
  # else
  #  include "magick-config.h"
  # endif
-@@ -121,25 +121,25 @@
+@@ -121,25 +121,25 @@ extern "C" {
  typedef struct _MagickWand
    MagickWand;
  
@@ -928,27 +762,11 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/MagickWand.h new/wand/MagickWand.h
  
  extern WandExport char
    *MagickGetException(const MagickWand *,ExceptionType *);
-Only in old/wand: MagickWand.pc.in
-Only in old/wand: Makefile.am
-Only in old/wand: Wand-config.1
-Only in old/wand: Wand-config.in
-Only in old/wand: Wand.pc.in
-Only in old/wand: animate.c
-Only in old/wand: animate.h
-Only in old/wand: common.sh
-Only in old/wand: compare.c
-Only in old/wand: compare.h
-Only in old/wand: composite.c
-Only in old/wand: composite.h
-Only in old/wand: conjure.c
-Only in old/wand: conjure.h
-Only in old/wand: convert.c
-Only in old/wand: convert.h
-Only in old/wand: deprecate.c
-diff -U 3 -r -x '*.o.cmd' -- old/wand/deprecate.h new/wand/deprecate.h
---- old/wand/deprecate.h	2011-03-18 22:29:28.000000000 +0100
-+++ new/wand/deprecate.h	2011-03-31 13:53:46.751999982 +0200
-@@ -24,10 +24,10 @@
+Index: ImageMagick-6.6.9-9/wand/deprecate.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/wand/deprecate.h
++++ ImageMagick-6.6.9-9/wand/deprecate.h
+@@ -24,10 +24,10 @@ extern "C" {
  
  #if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
  
@@ -963,12 +781,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/deprecate.h new/wand/deprecate.h
  
  typedef struct _DrawingWand
    *DrawContext;
-Only in old/wand: display.c
-Only in old/wand: display.h
-Only in old/wand: drawing-wand.c
-diff -U 3 -r -x '*.o.cmd' -- old/wand/drawing-wand.h new/wand/drawing-wand.h
---- old/wand/drawing-wand.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/wand/drawing-wand.h	2011-03-31 13:49:19.628999983 +0200
+Index: ImageMagick-6.6.9-9/wand/drawing-wand.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/wand/drawing-wand.h
++++ ImageMagick-6.6.9-9/wand/drawing-wand.h
 @@ -22,7 +22,7 @@
  extern "C" {
  #endif
@@ -978,25 +794,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/drawing-wand.h new/wand/drawing-wand.h
  
  typedef struct _DrawingWand
    DrawingWand;
-Only in old/wand: drawtest.c
-Only in old/wand: drawtest.sh
-Only in old/wand: identify.c
-Only in old/wand: identify.h
-Only in old/wand: import.c
-Only in old/wand: import.h
-Only in old/wand: input_256c.miff
-Only in old/wand: input_bilevel.miff
-Only in old/wand: input_gray.miff
-Only in old/wand: input_truecolor.miff
-Only in old/wand: magick-image.c
-Only in old/wand: magick-image.h
-Only in old/wand: magick-property.c
-Only in old/wand: magick-property.h
-Only in old/wand: magick-wand-private.h
-Only in old/wand: magick-wand.c
-diff -U 3 -r -x '*.o.cmd' -- old/wand/magick-wand.h new/wand/magick-wand.h
---- old/wand/magick-wand.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/wand/magick-wand.h	2011-03-31 13:54:46.686999982 +0200
+Index: ImageMagick-6.6.9-9/wand/magick-wand.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/wand/magick-wand.h
++++ ImageMagick-6.6.9-9/wand/magick-wand.h
 @@ -19,6 +19,6 @@
  #ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
  #define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
@@ -1005,16 +806,10 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/magick-wand.h new/wand/magick-wand.h
 +#include "MagickWand.h"
  
  #endif
-Only in old/wand: magick_wand.h
-Only in old/wand: mogrify-private.h
-Only in old/wand: mogrify.c
-Only in old/wand: mogrify.h
-Only in old/wand: montage.c
-Only in old/wand: montage.h
-Only in old/wand: pixel-iterator.c
-diff -U 3 -r -x '*.o.cmd' -- old/wand/pixel-iterator.h new/wand/pixel-iterator.h
---- old/wand/pixel-iterator.h	2010-12-05 00:12:08.000000000 +0100
-+++ new/wand/pixel-iterator.h	2011-03-31 13:56:23.775999983 +0200
+Index: ImageMagick-6.6.9-9/wand/pixel-iterator.h
+===================================================================
+--- ImageMagick-6.6.9-9.orig/wand/pixel-iterator.h
++++ ImageMagick-6.6.9-9/wand/pixel-iterator.h
 @@ -22,8 +22,8 @@
  extern "C" {
  #endif
@@ -1026,19 +821,3 @@ diff -U 3 -r -x '*.o.cmd' -- old/wand/pixel-iterator.h new/wand/pixel-iterator.h
  
  typedef struct _PixelIterator
    PixelIterator;
-Only in old/wand: pixel-wand-private.h
-Only in old/wand: pixel-wand.c
-Only in old/wand: pixel-wand.h
-Only in old/wand: sequence.miff
-Only in old/wand: stream.c
-Only in old/wand: stream.h
-Only in old/wand: studio.h
-Only in old/wand: wand-view.c
-Only in old/wand: wand-view.h
-Only in old/wand: wand.c
-Only in old/wand: wand.h
-Only in old/wand: wandtest.c
-Only in old/wand: wandtest.sh
-Only in old: wand.h
-Only in old: winpath.sh
-Only in old: www
diff --git a/ImageMagick.changes b/ImageMagick.changes
index d0a1f4a..373bb4b 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue May 24 19:57:16 UTC 2011 - dimstar@opensuse.org
+
+- Require ImageMagick from -devel subpackage: Packages that depend
+  on the -devel package very likely use the tools too.
+
+-------------------------------------------------------------------
+Tue May 17 12:00:36 CEST 2011 - pgajdos@suse.cz
+
+- updated to 6.6.9.9:
+  * The -scale option nows considers the alpha channel when scaling.
+  * Don't use comma as a separator for stroked tex.
+  * Fix transient bug for HSL to RGB and back.
+  * Fixed PNG8 reduction to work with an image that reduces to 256 colors
+    plus transparency, by merging the two darkest red colors.
+  * etc., see ChangeLog
+
 -------------------------------------------------------------------
 Sun May  8 21:17:51 UTC 2011 - giecrilj@stegny.2a.pl
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index fd600e5..75135bf 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -80,7 +80,7 @@ BuildRequires:  libjasper-devel
 
 %define xtp_version 5.4.3
 %define mfr_version 6.6.9
-%define mfr_revision 5
+%define mfr_revision 9
 %define source_version %{mfr_version}-%{mfr_revision}
 License:        Public Domain, Freeware
 Group:          Productivity/Graphics/Other
@@ -90,7 +90,7 @@ Release:        3
 %define libver  4
 Summary:        Viewer and Converter for Images
 Url:            http://www.imagemagick.org
-Source:         ImageMagick-6.6.9-5.tar.bz2
+Source:         ImageMagick-%{source_version}.tar.bz2
 # To get mtime of file
 Source1:        ImageMagick.changes
 %if %{with xtp}
@@ -114,6 +114,7 @@ AutoReqProv:    on
 %package devel
 License:        PERMISSIVE-OSI-COMPLIANT
 Requires:       libMagickCore%{libver} = %{version} libMagickWand%{libver} = %{version}
+Requires:       ImageMagick = %{version}
 Summary:        Include Files and Libraries Mandatory for Development
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on