[Pkg-gmagick-svn-commit] r75 - in branches/experimental/debian: . patches

naoliv at alioth.debian.org naoliv at alioth.debian.org
Mon Dec 22 20:02:22 UTC 2008


Author: naoliv
Date: 2008-12-22 20:02:21 +0000 (Mon, 22 Dec 2008)
New Revision: 75

Removed:
   branches/experimental/debian/patches/manpages.patch
Modified:
   branches/experimental/debian/README.Debian
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/series
Log:
- More fixes/cleanup;
- Remove manpages patch (applied upstream)


Modified: branches/experimental/debian/README.Debian
===================================================================
--- branches/experimental/debian/README.Debian	2008-12-21 20:01:58 UTC (rev 74)
+++ branches/experimental/debian/README.Debian	2008-12-22 20:02:21 UTC (rev 75)
@@ -1,4 +1,4 @@
-imagemagick for Debian
+ImageMagick for Debian
 
 ----------------------
 

Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2008-12-21 20:01:58 UTC (rev 74)
+++ branches/experimental/debian/changelog	2008-12-22 20:02:21 UTC (rev 75)
@@ -9,8 +9,10 @@
   * The ImageMagick logo has the same license as the ImageMagick distribution
     (thus we don't need to repackage and remove its logo from the tarball);
   * Remove debian/patches/add_dfsg_free_logo.patch;
+  * Remove debian/patches/manpages.patch (applied upstream);
   * ImageMagick does not include a font object unless a label is specified on
     the command line (Closes: #484059);
+  * Fix error message when trying to create a SVG file (Closes: #350410);
 
  -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 21 Dec 2008 15:36:30 -0200
 

Deleted: branches/experimental/debian/patches/manpages.patch
===================================================================
--- branches/experimental/debian/patches/manpages.patch	2008-12-21 20:01:58 UTC (rev 74)
+++ branches/experimental/debian/patches/manpages.patch	2008-12-22 20:02:21 UTC (rev 75)
@@ -1,2332 +0,0 @@
-Fix some hyphens, SEE ALSO section and copyright symbol
-
-diff -ur ImageMagick/magick/Magick-config.1 ImageMagick.new/magick/Magick-config.1
---- ImageMagick/magick/Magick-config.1	2008-03-20 23:16:09.000000000 -0300
-+++ ImageMagick.new/magick/Magick-config.1	2008-12-21 17:40:40.000000000 -0200
-@@ -24,7 +24,7 @@
- use:
- 
- .nf
--  Magick-config --version
-+  Magick-config \-\-version
- .fi
-   
- To compile a program that calls the 
-@@ -32,34 +32,34 @@
- Application Programmer Interface, use:
- 
- .nf
--  cc `Magick-config --cflags --cppflags --ldflags --libs` program.c
-+  cc `Magick-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c
- .fi
- 
- .SH OPTIONS
- .TP
--.B --cflags
-+.B \-\-cflags
- Print the compiler flags that were used to compile 
- .BR libMagick .
- .TP
--.B --cppflags
-+.B \-\-cppflags
- Print the preprocessor flags that are needed to find the
- .B ImageMagick
- C include files and defines to ensure that the ImageMagick data structures match between
- your program and the installed libraries.
- .TP
--.B --exec-prefix
-+.B \-\-exec-prefix
- Print the directory under which target specific binaries and executables are installed.
- .TP
--.B --ldflags
-+.B \-\-ldflags
- Print the linker flags that are needed to link with the
- .B ImageMagick
- library.
- .TP
--.B --libs
-+.B \-\-libs
- Print the linker flags that are needed to link a program with
- .BR libMagick .
- .TP
--.B --version
-+.B \-\-version
- Print the version of the
- .B ImageMagick
- distribution to standard output.
-diff -ur ImageMagick/magick/MagickCore-config.1 ImageMagick.new/magick/MagickCore-config.1
---- ImageMagick/magick/MagickCore-config.1	2008-03-20 23:16:09.000000000 -0300
-+++ ImageMagick.new/magick/MagickCore-config.1	2008-12-21 17:41:02.000000000 -0200
-@@ -24,7 +24,7 @@
- use:
- 
- .nf
--  MagickCore-config --version
-+  MagickCore-config \-\-version
- .fi
-   
- To compile a program that calls the 
-@@ -32,34 +32,34 @@
- Application Programmer Interface, use:
- 
- .nf
--  cc `MagickCore-config --cflags --cppflags --ldflags --libs` program.c
-+  cc `MagickCore-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c
- .fi
- 
- .SH OPTIONS
- .TP
--.B --cflags
-+.B \-\-cflags
- Print the compiler flags that were used to compile 
- .BR libMagick .
- .TP
--.B --cppflags
-+.B \-\-cppflags
- Print the preprocessor flags that are needed to find the
- .B ImageMagick
- C include files and defines to ensure that the ImageMagick data structures match between
- your program and the installed libraries.
- .TP
--.B --exec-prefix
-+.B \-\-exec-prefix
- Print the directory under which target specific binaries and executables are installed.
- .TP
--.B --ldflags
-+.B \-\-ldflags
- Print the linker flags that are needed to link with the
- .B ImageMagick
- library.
- .TP
--.B --libs
-+.B \-\-libs
- Print the linker flags that are needed to link a program with
- .BR libMagick .
- .TP
--.B --version
-+.B \-\-version
- Print the version of the
- .B ImageMagick
- distribution to standard output.
-diff -ur ImageMagick/Magick++/bin/Magick++-config.1 ImageMagick.new/Magick++/bin/Magick++-config.1
---- ImageMagick/Magick++/bin/Magick++-config.1	2008-03-20 23:19:03.000000000 -0300
-+++ ImageMagick.new/Magick++/bin/Magick++-config.1	2008-12-21 17:38:58.000000000 -0200
-@@ -26,7 +26,7 @@
- use:
- 
- .nf
--  Magick++-config --version
-+  Magick++-config \-\-version
- .fi
-   
- To compile a program that calls the 
-@@ -34,37 +34,37 @@
- C++ Application Programmer Interface, use:
- 
- .nf
--  c++ `Magick++-config --cxxflags --cppflags --ldflags --libs` program.cpp
-+  c++ `Magick++-config \-\-cxxflags \-\-cppflags \-\-ldflags \-\-libs` program.cpp
- .fi
- 
- .SH OPTIONS
- .TP
--.B --cppflags
-+.B \-\-cppflags
- Print the preprocessor flags that are needed to find the
- .B ImageMagick
- C and C++ include files and defines to ensures that the ImageMagick data structures match between
- your program and the installed libraries.
- .TP
--.B --cxxflags
-+.B \-\-cxxflags
- Print the compiler flags that were used to compile 
- .BR libMagick++ .
- .TP
--.B --exec-prefix
-+.B \-\-exec-prefix
- Print the directory under which target specific binaries and executables are installed.
- .TP
--.B --ldflags
-+.B \-\-ldflags
- Print the linker flags that are needed to link with the
- .B libMagick++
- library.
- .TP
--.B --libs
-+.B \-\-libs
- Print the linker flags that are needed to link a program with
- .BR libMagick++ .
- .TP
--.B --prefix
-+.B \-\-prefix
- Print the directory under which the package is installed.
- .TP
--.B --version
-+.B \-\-version
- Print the version of the
- .B ImageMagick
- distribution to standard output.
-diff -ur ImageMagick/utilities/animate.1.in ImageMagick.new/utilities/animate.1.in
---- ImageMagick/utilities/animate.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/animate.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,84 +10,84 @@
- For more information about the animate command, point your browser to file://@DOCUMENTATION_PATH@/www/animate.html or http://www.imagemagick.org/script/animate.php.
- .SH DESCRIPTION
- Image Settings:
--  -authenticate value  decrypt image with this password
--  -backdrop            display image centered on a backdrop
--  -channel type        apply option to select image channels
--  -colormap type       Shared or Private
--  -colorspace type     alternate image colorspace
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-authenticate value  decrypt image with this password
-+  \-backdrop            display image centered on a backdrop
-+  \-channel type        apply option to select image channels
-+  \-colormap type       Shared or Private
-+  \-colorspace type     alternate image colorspace
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -delay value         display the next image after pausing
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -display server      display image to this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -format "string"     output formatted image characteristics
--  -gamma value         level of gamma correction
--  -geometry geometry   preferred size and location of the Image window
--  -identify            identify the format and characteristics of the image
--  -immutable           displayed image cannot be modified
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -limit type value    pixel cache resource limit
--  -loop iterations     loop images then exit
--  -matte               store matte channel if the image has one
--  -map type            display image using this Standard Colormap
--  -monitor             monitor progress
--  -pause               seconds to pause before reanimating
--  -page geometry       size and location of an image canvas (setting)
--  -quantize colorspace reduce colors in this colorspace
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -remote command      execute a command in an remote display process
--  -sampling-factor geometry
-+  \-delay value         display the next image after pausing
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-display server      display image to this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-format "string"     output formatted image characteristics
-+  \-gamma value         level of gamma correction
-+  \-geometry geometry   preferred size and location of the Image window
-+  \-identify            identify the format and characteristics of the image
-+  \-immutable           displayed image cannot be modified
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-limit type value    pixel cache resource limit
-+  \-loop iterations     loop images then exit
-+  \-matte               store matte channel if the image has one
-+  \-map type            display image using this Standard Colormap
-+  \-monitor             monitor progress
-+  \-pause               seconds to pause before reanimating
-+  \-page geometry       size and location of an image canvas (setting)
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-remote command      execute a command in an remote display process
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scenes range        image scene range
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set attribute value set an image attribute
--  -size geometry       width and height of image
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -transparent-color color
-+  \-scenes range        image scene range
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set attribute value set an image attribute
-+  \-size geometry       width and height of image
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-transparent-color color
-                        transparent color
--  -treedepth value     color tree depth
--  -verbose             print detailed information about the image
--  -visual type         display image using this visual type
--  -virtual-pixel method
-+  \-treedepth value     color tree depth
-+  \-verbose             print detailed information about the image
-+  \-visual type         display image using this visual type
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -window id           display image to background of this window
-+  \-window id           display image to background of this window
- 
- Image Operators:
--  -colors value        preferred number of colors in the image
--  -crop geometry       preferred size and location of the cropped image
--  -extract geometry    extract area from image
--  -monochrome          transform image to black and white
--  -repage geometry     size and location of an image canvas (operator)
--  -resample geometry   change the resolution of an image
--  -resize geometry     resize the image
--  -rotate degrees      apply Paeth rotation to the image
--  -strip               strip image of all profiles and comments
--  -trim                trim image edges
-+  \-colors value        preferred number of colors in the image
-+  \-crop geometry       preferred size and location of the cropped image
-+  \-extract geometry    extract area from image
-+  \-monochrome          transform image to black and white
-+  \-repage geometry     size and location of an image canvas (operator)
-+  \-resample geometry   change the resolution of an image
-+  \-resize geometry     resize the image
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-strip               strip image of all profiles and comments
-+  \-trim                trim image edges
- 
- Image Sequence Operators:
--  -coalesce            merge a sequence of images
--  -flatten             flatten a sequence of images
-+  \-coalesce            merge a sequence of images
-+  \-flatten             flatten a sequence of images
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
--In addition to those listed above, you can specify these standard X resources as command line options:  -background, -bordercolor, -borderwidth, -font, -foreground, -iconGeometry, -iconic, -name, -mattecolor, -shared-memory, or -title.  
-+In addition to those listed above, you can specify these standard X resources as command line options:  \-background, \-bordercolor, \-borderwidth, \-font, \-foreground, \-iconGeometry, \-iconic, \-name, \-mattecolor, \-shared-memory, or \-title.  
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
- 
- Buttons: 
-   1    press to map or unmap the Command widget
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/compare.1.in ImageMagick.new/utilities/compare.1.in
---- ImageMagick/utilities/compare.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/compare.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,55 +10,55 @@
- For more information about the compare command, point your browser to file://@DOCUMENTATION_PATH@/www/compare.html or http://www.imagemagick.org/script/compare.php.
- .SH DESCRIPTION
- Image Settings:
--  -authenticate value  decrypt image with this password
--  -channel type        apply option to select image channels
--  -colorspace type     alternate image colorspace
--  -compose operator    set image composite operator
--  -compress type       type of pixel compression when writing the image
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-authenticate value  decrypt image with this password
-+  \-channel type        apply option to select image channels
-+  \-colorspace type     alternate image colorspace
-+  \-compose operator    set image composite operator
-+  \-compress type       type of pixel compression when writing the image
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -encipher filename   convert plain pixels to cipher pixels
--  -extract geometry    extract area from image
--  -format "string"     output formatted image characteristics
--  -fuzz distance       colors within this distance are considered equal
--  -identify            identify the format and characteristics of the image
--  -interlace type      type of image interlacing scheme
--  -highlight-color color
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-encipher filename   convert plain pixels to cipher pixels
-+  \-extract geometry    extract area from image
-+  \-format "string"     output formatted image characteristics
-+  \-fuzz distance       colors within this distance are considered equal
-+  \-identify            identify the format and characteristics of the image
-+  \-interlace type      type of image interlacing scheme
-+  \-highlight-color color
-                        emphasize pixel differences with this color
--  -limit type value    pixel cache resource limit
--  -lowlight-color color
-+  \-limit type value    pixel cache resource limit
-+  \-lowlight-color color
-                        de-emphasize pixel differences with this color
--  -metric type         measure differences between images with this metric
--  -monitor             monitor progress
--  -profile filename    add, delete, or apply an image profile
--  -quality value       JPEG/MIFF/PNG compression level
--  -quiet               suppress all warning messages
--  -quantize colorspace reduce colors in this colorspace
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-metric type         measure differences between images with this metric
-+  \-monitor             monitor progress
-+  \-profile filename    add, delete, or apply an image profile
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quiet               suppress all warning messages
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set attribute value set an image attribute
--  -size geometry       width and height of image
--  -transparent-color color
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set attribute value set an image attribute
-+  \-size geometry       width and height of image
-+  \-transparent-color color
-                        transparent color
--  -type type           image type
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-type type           image type
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        virtual pixel access method
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/composite.1.in ImageMagick.new/utilities/composite.1.in
---- ImageMagick/utilities/composite.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/composite.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,93 +10,93 @@
- For more information about the composite command, point your browser to file://@DOCUMENTATION_PATH@/www/composite.html or http://www.imagemagick.org/script/composite.php.
- .SH DESCRIPTION
- Image Settings:
--  -affine matrix       affine transform matrix
--  -authenticate value  decrypt image with this password
--  -blue-primary point  chromaticity blue primary point
--  -channel type        apply option to select image channels
--  -colorspace type     alternate image colorspace
--  -comment string      annotate image with comment
--  -compose operator    composite operator
--  -compress type       type of pixel compression when writing the image
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-affine matrix       affine transform matrix
-+  \-authenticate value  decrypt image with this password
-+  \-blue-primary point  chromaticity blue primary point
-+  \-channel type        apply option to select image channels
-+  \-colorspace type     alternate image colorspace
-+  \-comment string      annotate image with comment
-+  \-compose operator    composite operator
-+  \-compress type       type of pixel compression when writing the image
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -depth value         image depth
--  -density geometry    horizontal and vertical density of the image
--  -display server      get image or font from this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -encipher filename   convert plain pixels to cipher pixels
--  -encoding type       text encoding type
--  -endian type         endianness (MSB or LSB) of the image
--  -filter type         use this filter when resizing an image
--  -font name           render text with this font
--  -format "string"     output formatted image characteristics
--  -gravity type        which direction to gravitate towards
--  -green-primary point chromaticity green primary point
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    pixel cache resource limit
--  -matte               store matte channel if the image has one
--  -monitor             monitor progress
--  -page geometry       size and location of an image canvas (setting)
--  -pointsize value     font point size
--  -quality value       JPEG/MIFF/PNG compression level
--  -quiet               suppress all warning messages
--  -red-primary point   chromaticity red primary point
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-depth value         image depth
-+  \-density geometry    horizontal and vertical density of the image
-+  \-display server      get image or font from this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-encipher filename   convert plain pixels to cipher pixels
-+  \-encoding type       text encoding type
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-filter type         use this filter when resizing an image
-+  \-font name           render text with this font
-+  \-format "string"     output formatted image characteristics
-+  \-gravity type        which direction to gravitate towards
-+  \-green-primary point chromaticity green primary point
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    pixel cache resource limit
-+  \-matte               store matte channel if the image has one
-+  \-monitor             monitor progress
-+  \-page geometry       size and location of an image canvas (setting)
-+  \-pointsize value     font point size
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quiet               suppress all warning messages
-+  \-red-primary point   chromaticity red primary point
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scene value         image scene number
--  -seed value          seed a new sequence of pseudo-random numbers
--  -size geometry       width and height of image
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -transparent-color color
-+  \-scene value         image scene number
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-size geometry       width and height of image
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-transparent-color color
-                        transparent color
--  -treedepth value     color tree depth
--  -tile                repeat composite operation across and down image
--  -units type          the units of image resolution
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-treedepth value     color tree depth
-+  \-tile                repeat composite operation across and down image
-+  \-units type          the units of image resolution
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -white-point point   chromaticity white point
-+  \-white-point point   chromaticity white point
- 
- Image Operators:
--  -blend geometry      blend images
--  -colors value        preferred number of colors in the image
--  -displace geometry   shift image pixels defined by a displacement map
--  -dissolve value      dissolve the two images a given percent
--  -extract geometry    extract area from image
--  -geometry geometry   location of the composite image
--  -identify            identify the format and characteristics of the image
--  -monochrome          transform image to black and white
--  -negate              replace every pixel with its complementary color 
--  -profile filename    add ICM or IPTC information profile to image
--  -quantize colorspace reduce colors in this colorspace
--  -repage geometry     size and location of an image canvas (operator)
--  -rotate degrees      apply Paeth rotation to the image
--  -resize geometry     resize the image
--  -sharpen geometry    sharpen the image
--  -stegano offset      hide watermark within an image
--  -stereo              combine two image to create a stereo anaglyph
--  -strip               strip image of all profiles and comments
--  -thumbnail geometry  create a thumbnail of the image
--  -transform           affine transform image
--  -type type           image type
--  -unsharp geometry    sharpen the image
--  -watermark geometry  percent brightness and saturation of a watermark
--  -write filename      write images to this file
-+  \-blend geometry      blend images
-+  \-colors value        preferred number of colors in the image
-+  \-displace geometry   shift image pixels defined by a displacement map
-+  \-dissolve value      dissolve the two images a given percent
-+  \-extract geometry    extract area from image
-+  \-geometry geometry   location of the composite image
-+  \-identify            identify the format and characteristics of the image
-+  \-monochrome          transform image to black and white
-+  \-negate              replace every pixel with its complementary color 
-+  \-profile filename    add ICM or IPTC information profile to image
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-repage geometry     size and location of an image canvas (operator)
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-resize geometry     resize the image
-+  \-sharpen geometry    sharpen the image
-+  \-stegano offset      hide watermark within an image
-+  \-stereo              combine two image to create a stereo anaglyph
-+  \-strip               strip image of all profiles and comments
-+  \-thumbnail geometry  create a thumbnail of the image
-+  \-transform           affine transform image
-+  \-type type           image type
-+  \-unsharp geometry    sharpen the image
-+  \-watermark geometry  percent brightness and saturation of a watermark
-+  \-write filename      write images to this file
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/conjure.1.in ImageMagick.new/utilities/conjure.1.in
---- ImageMagick/utilities/conjure.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/conjure.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,23 +10,23 @@
- For more information about the conjure command, point your browser to file://@DOCUMENTATION_PATH@/www/conjure.html or http://www.imagemagick.org/script/conjure.php.
- .SH DESCRIPTION
- Image Settings:
--  -monitor             monitor progress
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -seed value          seed a new sequence of pseudo-random numbers
--  -verbose             print detailed information about the image
-+  \-monitor             monitor progress
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-verbose             print detailed information about the image
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- In additiion, define any key value pairs required by your script.  For example,
- 
--    conjure -size 100x100 -color blue -foo bar script.msl
--.SH SEE-ALSO
-+    conjure \-size 100x100 \-color blue \-foo bar script.msl
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/convert.1.in ImageMagick.new/utilities/convert.1.in
---- ImageMagick/utilities/convert.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/convert.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,238 +10,238 @@
- For more information about the convert command, point your browser to file://@DOCUMENTATION_PATH@/www/convert.html or http://www.imagemagick.org/script/convert.php.
- .SH DESCRIPTION
- Image Settings:
--  -adjoin              join images into a single multi-image file
--  -affine matrix       affine transform matrix
--  -antialias           remove pixel-aliasing
--  -authenticate value  decrypt image with this password
--  -background color    background color
--  -bias value          add bias when convolving an image
--  -black-point-compensation
-+  \-adjoin              join images into a single multi-image file
-+  \-affine matrix       affine transform matrix
-+  \-antialias           remove pixel-aliasing
-+  \-authenticate value  decrypt image with this password
-+  \-background color    background color
-+  \-bias value          add bias when convolving an image
-+  \-black-point-compensation
-                        use black point compensation
--  -blue-primary point  chromaticity blue primary point
--  -bordercolor color   border color
--  -caption string      assign a caption to an image
--  -channel type        apply option to select image channels
--  -colors value        preferred number of colors in the image
--  -colorspace type     alternate image colorspace
--  -comment string      annotate image with comment
--  -compose operator    set image composite operator
--  -compress type       type of pixel compression when writing the image
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-blue-primary point  chromaticity blue primary point
-+  \-bordercolor color   border color
-+  \-caption string      assign a caption to an image
-+  \-channel type        apply option to select image channels
-+  \-colors value        preferred number of colors in the image
-+  \-colorspace type     alternate image colorspace
-+  \-comment string      annotate image with comment
-+  \-compose operator    set image composite operator
-+  \-compress type       type of pixel compression when writing the image
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -delay value         display the next image after pausing
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -display server      get image or font from this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -encipher filename   convert plain pixels to cipher pixels
--  -encoding type       text encoding type
--  -endian type         endianness (MSB or LSB) of the image
--  -family name         render text with this font family
--  -fill color          color to use when filling a graphic primitive
--  -filter type         use this filter when resizing an image
--  -flatten             flatten a sequence of images
--  -font name           render text with this font
--  -format "string"     output formatted image characteristics
--  -fuzz distance       colors within this distance are considered equal
--  -gravity type        horizontal and vertical text placement
--  -green-primary point chromaticity green primary point
--  -intent type         type of rendering intent when managing the image color
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    pixel cache resource limit
--  -loop iterations     add Netscape loop extension to your GIF animation
--  -mask filename       associate a mask with the image
--  -matte               store matte channel if the image has one
--  -mattecolor color    frame color
--  -monitor             monitor progress
--  -orient type         image orientation
--  -origin geometry     image origin
--  -page geometry       size and location of an image canvas (setting)
--  -ping                efficiently determine image attributes
--  -pointsize value     font point size
--  -preview type        image preview type
--  -quality value       JPEG/MIFF/PNG compression level
--  -quiet               suppress all warning messages
--  -red-primary point   chromaticity red primary point
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-delay value         display the next image after pausing
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-display server      get image or font from this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-encipher filename   convert plain pixels to cipher pixels
-+  \-encoding type       text encoding type
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-family name         render text with this font family
-+  \-fill color          color to use when filling a graphic primitive
-+  \-filter type         use this filter when resizing an image
-+  \-flatten             flatten a sequence of images
-+  \-font name           render text with this font
-+  \-format "string"     output formatted image characteristics
-+  \-fuzz distance       colors within this distance are considered equal
-+  \-gravity type        horizontal and vertical text placement
-+  \-green-primary point chromaticity green primary point
-+  \-intent type         type of rendering intent when managing the image color
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    pixel cache resource limit
-+  \-loop iterations     add Netscape loop extension to your GIF animation
-+  \-mask filename       associate a mask with the image
-+  \-matte               store matte channel if the image has one
-+  \-mattecolor color    frame color
-+  \-monitor             monitor progress
-+  \-orient type         image orientation
-+  \-origin geometry     image origin
-+  \-page geometry       size and location of an image canvas (setting)
-+  \-ping                efficiently determine image attributes
-+  \-pointsize value     font point size
-+  \-preview type        image preview type
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quiet               suppress all warning messages
-+  \-red-primary point   chromaticity red primary point
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scene value         image scene number
--  -seed value          seed a new sequence of pseudo-random numbers
--  -size geometry       width and height of image
--  -stretch type        render text with this font stretch
--  -stroke color        graphic primitive stroke color
--  -strokewidth value   graphic primitive stroke width
--  -style type          render text with this font style
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -texture filename    name of texture to tile onto the image background
--  -tile-offset geometry
-+  \-scene value         image scene number
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-size geometry       width and height of image
-+  \-stretch type        render text with this font stretch
-+  \-stroke color        graphic primitive stroke color
-+  \-strokewidth value   graphic primitive stroke width
-+  \-style type          render text with this font style
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-texture filename    name of texture to tile onto the image background
-+  \-tile-offset geometry
-                        tile offset
--  -treedepth value     color tree depth
--  -transparent-color color
-+  \-treedepth value     color tree depth
-+  \-transparent-color color
-                        transparent color
--  -undercolor color    annotation bounding box color
--  -units type          the units of image resolution
--  -verbose             print detailed information about the image
--  -view                FlashPix viewing transforms
--  -virtual-pixel method
-+  \-undercolor color    annotation bounding box color
-+  \-units type          the units of image resolution
-+  \-verbose             print detailed information about the image
-+  \-view                FlashPix viewing transforms
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -weight type         render text with this font weight
--  -white-point point   chromaticity white point
-+  \-weight type         render text with this font weight
-+  \-white-point point   chromaticity white point
- 
- Image Operators:
--  -adaptive-blur geometry
-+  \-adaptive-blur geometry
-                        adaptively blur pixels; decrease effect near edges
--  -adaptive-resize geometry
-+  \-adaptive-resize geometry
-                        adaptively resize image with data dependent triangulation
--  -adaptive-sharpen geometry
-+  \-adaptive-sharpen geometry
-                        adaptively sharpen pixels; increase effect near edges
--  -annotate geometry text
-+  \-annotate geometry text
-                        annotate the image with text
--  -auto-orient         automatically orient image
--  -black-threshold value
-+  \-auto-orient         automatically orient image
-+  \-black-threshold value
-                        force all pixels below the threshold into black
--  -blur geometry       reduce image noise and reduce detail levels
--  -border geometry     surround image with a border of color
--  -charcoal radius     simulate a charcoal drawing
--  -chop geometry       remove pixels from the image interior
--  -clip                clip along the first path from the 8BIM profile
--  -clip-mask filename  associate a clip mask with the image
--  -clip-path id        clip along a named path from the 8BIM profile
--  -colorize value      colorize the image with the fill color
--  -contrast            enhance or reduce the image contrast
--  -contrast-stretch geometry
-+  \-blur geometry       reduce image noise and reduce detail levels
-+  \-border geometry     surround image with a border of color
-+  \-charcoal radius     simulate a charcoal drawing
-+  \-chop geometry       remove pixels from the image interior
-+  \-clip                clip along the first path from the 8BIM profile
-+  \-clip-mask filename  associate a clip mask with the image
-+  \-clip-path id        clip along a named path from the 8BIM profile
-+  \-colorize value      colorize the image with the fill color
-+  \-contrast            enhance or reduce the image contrast
-+  \-contrast-stretch geometry
-                        improve contrast by `stretching' the intensity range
--  -convolve coefficients
-+  \-convolve coefficients
-                        apply a convolution kernel to the image
--  -cycle amount        cycle the image colormap
--  -despeckle           reduce the speckles within an image
--  -draw string         annotate the image with a graphic primitive
--  -edge radius         apply a filter to detect edges in the image
--  -emboss radius       emboss an image
--  -enhance             apply a digital filter to enhance a noisy image
--  -equalize            perform histogram equalization to an image
--  -evaluate operator value
-+  \-cycle amount        cycle the image colormap
-+  \-despeckle           reduce the speckles within an image
-+  \-draw string         annotate the image with a graphic primitive
-+  \-edge radius         apply a filter to detect edges in the image
-+  \-emboss radius       emboss an image
-+  \-enhance             apply a digital filter to enhance a noisy image
-+  \-equalize            perform histogram equalization to an image
-+  \-evaluate operator value
-                        evaluate an arithmetic, relational, or logical expression
--  -extent geometry     set the image size
--  -extract geometry    extract area from image
--  -flip                flip image vertically
--  -floodfill geometry color
-+  \-extent geometry     set the image size
-+  \-extract geometry    extract area from image
-+  \-flip                flip image vertically
-+  \-floodfill geometry color
-                        floodfill the image with color
--  -flop                flop image horizontally
--  -frame geometry      surround image with an ornamental border
--  -gamma value         level of gamma correction
--  -gaussian-blur geometry
-+  \-flop                flop image horizontally
-+  \-frame geometry      surround image with an ornamental border
-+  \-gamma value         level of gamma correction
-+  \-gaussian-blur geometry
-                        reduce image noise and reduce detail levels
--  -geometry geometry   perferred size or location of the image
--  -identify            identify the format and characteristics of the image
--  -implode amount      implode image pixels about the center
--  -lat geometry        local adaptive thresholding
--  -layers method       optimize or compare image layers
--  -level value         adjust the level of image contrast
--  -linear-stretch geometry
-+  \-geometry geometry   perferred size or location of the image
-+  \-identify            identify the format and characteristics of the image
-+  \-implode amount      implode image pixels about the center
-+  \-lat geometry        local adaptive thresholding
-+  \-layers method       optimize or compare image layers
-+  \-level value         adjust the level of image contrast
-+  \-linear-stretch geometry
-                        improve contrast by `stretching with saturation' the intensity range
--  -median radius       apply a median filter to the image
--  -modulate value      vary the brightness, saturation, and hue
--  -monochrome          transform image to black and white
--  -motion-blur geometry
-+  \-median radius       apply a median filter to the image
-+  \-modulate value      vary the brightness, saturation, and hue
-+  \-monochrome          transform image to black and white
-+  \-motion-blur geometry
-                        simulate motion blur
--  -negate              replace every pixel with its complementary color 
--  -noise radius        add or reduce noise in an image
--  -normalize           transform image to span the full range of colors
--  -opaque color        change this color to the fill color
--  -ordered-dither NxN
-+  \-negate              replace every pixel with its complementary color 
-+  \-noise radius        add or reduce noise in an image
-+  \-normalize           transform image to span the full range of colors
-+  \-opaque color        change this color to the fill color
-+  \-ordered-dither NxN
-                        add a noise pattern to the image with specific amplitudes
--  -paint radius        simulate an oil painting
--  -polaroid angle      simulate a Polaroid picture
--  -posterize levels    reduce the image to a limited number of color levels
--  -print string        interpret string and print to console
--  -profile filename    add, delete, or apply an image profile
--  -quantize colorspace reduce colors in this colorspace
--  -radial-blur angle   radial blur the image
--  -raise value         lighten/darken image edges to create a 3-D effect
--  -random-threshold low,high
-+  \-paint radius        simulate an oil painting
-+  \-polaroid angle      simulate a Polaroid picture
-+  \-posterize levels    reduce the image to a limited number of color levels
-+  \-print string        interpret string and print to console
-+  \-profile filename    add, delete, or apply an image profile
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-radial-blur angle   radial blur the image
-+  \-raise value         lighten/darken image edges to create a 3-D effect
-+  \-random-threshold low,high
-                        random threshold the image
--  -recolor matrix      translate, scale, shear, or rotate image colors
--  -region geometry     apply options to a portion of the image
--  -render              render vector graphics
--  -repage geometry     size and location of an image canvas
--  -resample geometry   change the resolution of an image
--  -resize geometry     resize the image
--  -roll geometry       roll an image vertically or horizontally
--  -rotate degrees      apply Paeth rotation to the image
--  -sample geometry     scale image with pixel sampling
--  -scale geometry      scale the image
--  -segment values      segment an image
--  -sepia-tone threshold
-+  \-recolor matrix      translate, scale, shear, or rotate image colors
-+  \-region geometry     apply options to a portion of the image
-+  \-render              render vector graphics
-+  \-repage geometry     size and location of an image canvas
-+  \-resample geometry   change the resolution of an image
-+  \-resize geometry     resize the image
-+  \-roll geometry       roll an image vertically or horizontally
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-sample geometry     scale image with pixel sampling
-+  \-scale geometry      scale the image
-+  \-segment values      segment an image
-+  \-sepia-tone threshold
-                        simulate a sepia-toned photo
--  -set property value  set an image property
--  -shade degrees       shade the image using a distant light source
--  -shadow geometry     simulate an image shadow
--  -sharpen geometry    sharpen the image
--  -shave geometry      shave pixels from the image edges
--  -shear geometry      slide one edge of the image along the X or Y axis
--  -sigmoidal-contrast geometry
-+  \-set property value  set an image property
-+  \-shade degrees       shade the image using a distant light source
-+  \-shadow geometry     simulate an image shadow
-+  \-sharpen geometry    sharpen the image
-+  \-shave geometry      shave pixels from the image edges
-+  \-shear geometry      slide one edge of the image along the X or Y axis
-+  \-sigmoidal-contrast geometry
-                        lightness rescaling using sigmoidal contrast enhancement
--  -sketch geometry     simulate a pencil sketch
--  -solarize threshold  negate all pixels above the threshold level
--  -splice geometry     splice the background color into the image
--  -spread amount       displace image pixels by a random amount
--  -strip               strip image of all profiles and comments
--  -swirl degrees       swirl image pixels about the center
--  -threshold value     threshold the image
--  -thumbnail geometry  create a thumbnail of the image
--  -tile filename       tile image when filling a graphic primitive
--  -tint value          tint the image with the fill color
--  -transform           affine transform image
--  -transparent color   make this color transparent within the image
--  -transpose           flip image vertically and rotate 90 degrees
--  -transverse          flop image horizontally and rotate 270 degrees
--  -trim                trim image edges
--  -type type           image type
--  -unique-colors       discard all but one of any pixel color
--  -unsharp geometry    sharpen the image
--  -vignette geometry   soften the edges of the image in vignette style
--  -wave geometry       alter an image along a sine wave
--  -white-threshold value
-+  \-sketch geometry     simulate a pencil sketch
-+  \-solarize threshold  negate all pixels above the threshold level
-+  \-splice geometry     splice the background color into the image
-+  \-spread amount       displace image pixels by a random amount
-+  \-strip               strip image of all profiles and comments
-+  \-swirl degrees       swirl image pixels about the center
-+  \-threshold value     threshold the image
-+  \-thumbnail geometry  create a thumbnail of the image
-+  \-tile filename       tile image when filling a graphic primitive
-+  \-tint value          tint the image with the fill color
-+  \-transform           affine transform image
-+  \-transparent color   make this color transparent within the image
-+  \-transpose           flip image vertically and rotate 90 degrees
-+  \-transverse          flop image horizontally and rotate 270 degrees
-+  \-trim                trim image edges
-+  \-type type           image type
-+  \-unique-colors       discard all but one of any pixel color
-+  \-unsharp geometry    sharpen the image
-+  \-vignette geometry   soften the edges of the image in vignette style
-+  \-wave geometry       alter an image along a sine wave
-+  \-white-threshold value
-                        force all pixels above the threshold into white
- 
- Image Sequence Operators:
--  -affinity filename   transform image colors to match this set of colors
--  -append              append an image sequence
--  -average             average an image sequence
--  -coalesce            merge a sequence of images
--  -combine             combine a sequence of images
--  -composite           composite image
--  -crop geometry       cut out a rectangular region of the image
--  -deconstruct         break down an image sequence into constituent parts
--  -flatten             flatten a sequence of images
--  -fx expression       apply mathematical expression to an image channel(s)
--  -morph value         morph an image sequence
--  -mosaic              create a mosaic from an image sequence
--  -process arguments   process the image with a custom image filter
--  -separate            separate an image channel into a grayscale image
--  -write filename      write images to this file
-+  \-affinity filename   transform image colors to match this set of colors
-+  \-append              append an image sequence
-+  \-average             average an image sequence
-+  \-coalesce            merge a sequence of images
-+  \-combine             combine a sequence of images
-+  \-composite           composite image
-+  \-crop geometry       cut out a rectangular region of the image
-+  \-deconstruct         break down an image sequence into constituent parts
-+  \-flatten             flatten a sequence of images
-+  \-fx expression       apply mathematical expression to an image channel(s)
-+  \-morph value         morph an image sequence
-+  \-mosaic              create a mosaic from an image sequence
-+  \-process arguments   process the image with a custom image filter
-+  \-separate            separate an image channel into a grayscale image
-+  \-write filename      write images to this file
- 
- Image Stack Operators:
--  -clone index         clone an image
--  -delete index        delete the image from the image sequence
--  -insert index        insert last image into the image sequence
--  -swap indexes        swap two images in the image sequence
-+  \-clone index         clone an image
-+  \-delete index        delete the image from the image sequence
-+  \-insert index        insert last image into the image sequence
-+  \-swap indexes        swap two images in the image sequence
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/display.1.in ImageMagick.new/utilities/display.1.in
---- ImageMagick/utilities/display.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/display.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,107 +10,107 @@
- For more information about the display command, point your browser to file://@DOCUMENTATION_PATH@/www/display.html or http://www.imagemagick.org/script/display.php.
- .SH DESCRIPTION
- Image Settings:
--  -antialias           remove pixel-aliasing
--  -authenticate value  decrypt image with this password
--  -backdrop            display image centered on a backdrop
--  -channel type        apply option to select image channels
--  -colormap type       Shared or Private
--  -colorspace type     alternate image colorspace
--  -comment string      annotate image with comment
--  -compress type       type of pixel compression when writing the image
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-antialias           remove pixel-aliasing
-+  \-authenticate value  decrypt image with this password
-+  \-backdrop            display image centered on a backdrop
-+  \-channel type        apply option to select image channels
-+  \-colormap type       Shared or Private
-+  \-colorspace type     alternate image colorspace
-+  \-comment string      annotate image with comment
-+  \-compress type       type of pixel compression when writing the image
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -delay value         display the next image after pausing
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -display server      display image to this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -endian type         endianness (MSB or LSB) of the image
--  -filter type         use this filter when resizing an image
--  -format "string"     output formatted image characteristics
--  -fuzz distance       colors within this distance are considered equal
--  -geometry geometry   preferred size and location of the Image window
--  -identify            identify the format and characteristics of the image
--  -immutable           displayed image cannot be modified
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    pixel cache resource limit
--  -loop iterations     loop images then exit
--  -map type            display image using this Standard Colormap
--  -matte               store matte channel if the image has one
--  -monitor             monitor progress
--  -page geometry       size and location of an image canvas
--  -profile filename    add, delete, or apply an image profile
--  -quality value       JPEG/MIFF/PNG compression level
--  -quantize colorspace reduce colors in this colorspace
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -remote command      execute a command in an remote display process
--  -repage geometry     size and location of an image canvas (operator)
--  -sampling-factor geometry
-+  \-delay value         display the next image after pausing
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-display server      display image to this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-filter type         use this filter when resizing an image
-+  \-format "string"     output formatted image characteristics
-+  \-fuzz distance       colors within this distance are considered equal
-+  \-geometry geometry   preferred size and location of the Image window
-+  \-identify            identify the format and characteristics of the image
-+  \-immutable           displayed image cannot be modified
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    pixel cache resource limit
-+  \-loop iterations     loop images then exit
-+  \-map type            display image using this Standard Colormap
-+  \-matte               store matte channel if the image has one
-+  \-monitor             monitor progress
-+  \-page geometry       size and location of an image canvas
-+  \-profile filename    add, delete, or apply an image profile
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-remote command      execute a command in an remote display process
-+  \-repage geometry     size and location of an image canvas (operator)
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scenes range        image scene range
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set property value  set an image property
--  -size geometry       width and height of image
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -texture filename    name of texture to tile onto the image background
--  -transparent-color color
-+  \-scenes range        image scene range
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set property value  set an image property
-+  \-size geometry       width and height of image
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-texture filename    name of texture to tile onto the image background
-+  \-transparent-color color
-                        transparent color
--  -treedepth value     color tree depth
--  -update seconds      detect when image file is modified and redisplay
--  -verbose             print detailed information about the image
--  -visual type         display image using this visual type
--  -virtual-pixel method
-+  \-treedepth value     color tree depth
-+  \-update seconds      detect when image file is modified and redisplay
-+  \-verbose             print detailed information about the image
-+  \-visual type         display image using this visual type
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -window id           display image to background of this window
--  -window-group id     exit program when this window id is destroyed
--  -write filename      write image to a file
-+  \-window id           display image to background of this window
-+  \-window-group id     exit program when this window id is destroyed
-+  \-write filename      write image to a file
- 
- Image Operators:
--  -auto-orient         automatically orient image
--  -border geometry     surround image with a border of color
--  -clip                clip along the first path from the 8BIM profile
--  -clip-path id        clip along a named path from the 8BIM profile
--  -colors value        preferred number of colors in the image
--  -contrast            enhance or reduce the image contrast
--  -crop geometry       preferred size and location of the cropped image
--  -despeckle           reduce the speckles within an image
--  -edge factor         apply a filter to detect edges in the image
--  -enhance             apply a digital filter to enhance a noisy image
--  -extract geometry    extract area from image
--  -flip                flip image in the vertical direction
--  -flop                flop image in the horizontal direction
--  -frame geometry      surround image with an ornamental border
--  -gamma value         level of gamma correction
--  -monochrome          transform image to black and white
--  -negate              replace every pixel with its complementary color
--  -raise value         lighten/darken image edges to create a 3-D effect
--  -resample geometry   change the resolution of an image
--  -resize geometry     resize the image
--  -roll geometry       roll an image vertically or horizontally
--  -rotate degrees      apply Paeth rotation to the image
--  -sample geometry     scale image with pixel sampling
--  -segment value       segment an image
--  -sharpen geometry    sharpen the image
--  -strip               strip image of all profiles and comments
--  -trim                trim image edges
-+  \-auto-orient         automatically orient image
-+  \-border geometry     surround image with a border of color
-+  \-clip                clip along the first path from the 8BIM profile
-+  \-clip-path id        clip along a named path from the 8BIM profile
-+  \-colors value        preferred number of colors in the image
-+  \-contrast            enhance or reduce the image contrast
-+  \-crop geometry       preferred size and location of the cropped image
-+  \-despeckle           reduce the speckles within an image
-+  \-edge factor         apply a filter to detect edges in the image
-+  \-enhance             apply a digital filter to enhance a noisy image
-+  \-extract geometry    extract area from image
-+  \-flip                flip image in the vertical direction
-+  \-flop                flop image in the horizontal direction
-+  \-frame geometry      surround image with an ornamental border
-+  \-gamma value         level of gamma correction
-+  \-monochrome          transform image to black and white
-+  \-negate              replace every pixel with its complementary color
-+  \-raise value         lighten/darken image edges to create a 3-D effect
-+  \-resample geometry   change the resolution of an image
-+  \-resize geometry     resize the image
-+  \-roll geometry       roll an image vertically or horizontally
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-sample geometry     scale image with pixel sampling
-+  \-segment value       segment an image
-+  \-sharpen geometry    sharpen the image
-+  \-strip               strip image of all profiles and comments
-+  \-trim                trim image edges
- 
- Image Sequence Operators:
--  -coalesce            merge a sequence of images
--  -flatten             flatten a sequence of images
-+  \-coalesce            merge a sequence of images
-+  \-flatten             flatten a sequence of images
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
--In addition to those listed above, you can specify these standard X resources as command line options:  -background, -bordercolor, -borderwidth, -font, -foreground, -iconGeometry, -iconic, -mattecolor, -name, -shared-memory, -usePixmap, or -title.
-+In addition to those listed above, you can specify these standard X resources as command line options:  \-background, \-bordercolor, \-borderwidth, \-font, \-foreground, \-iconGeometry, \-iconic, \-mattecolor, \-name, \-shared-memory, \-usePixmap, or \-title.
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
- 
-@@ -118,7 +118,7 @@
-   1    press to map or unmap the Command widget
-   2    press and drag to magnify a region of an image
-   3    press to load an image from a visual image directory
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/identify.1.in ImageMagick.new/utilities/identify.1.in
---- ImageMagick/utilities/identify.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/identify.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,47 +10,47 @@
- For more information about the identify command, point your browser to file://@DOCUMENTATION_PATH@/www/identify.html or http://www.imagemagick.org/script/identify.php.
- .SH DESCRIPTION
- Image Settings:
--  -antialias           remove pixel-aliasing
--  -authenticate value  decrypt image with this password
--  -channel type        apply option to select image channels
--  -crop geometry       cut out a rectangular region of the image
--  -define format:option
-+  \-antialias           remove pixel-aliasing
-+  \-authenticate value  decrypt image with this password
-+  \-channel type        apply option to select image channels
-+  \-crop geometry       cut out a rectangular region of the image
-+  \-define format:option
-                        define one or more image format options
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -extract geometry    extract area from image
--  -format "string"     output formatted image characteristics
--  -fuzz distance       colors within this distance are considered equal
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -limit type value    pixel cache resource limit
--  -list type           Color, Configure, Delegate, Format, Magic, Module,
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-extract geometry    extract area from image
-+  \-format "string"     output formatted image characteristics
-+  \-fuzz distance       colors within this distance are considered equal
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-limit type value    pixel cache resource limit
-+  \-list type           Color, Configure, Delegate, Format, Magic, Module,
-                        Resource, or Type
--  -matte               store matte channel if the image has one
--  -monitor             monitor progress
--  -ping                efficiently determine image attributes
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-matte               store matte channel if the image has one
-+  \-monitor             monitor progress
-+  \-ping                efficiently determine image attributes
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set attribute value set an image attribute
--  -size geometry       width and height of image
--  -strip               strip image of all profiles and comments
--  -units type          the units of image resolution
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set attribute value set an image attribute
-+  \-size geometry       width and height of image
-+  \-strip               strip image of all profiles and comments
-+  \-units type          the units of image resolution
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        virtual pixel access method
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/ImageMagick.1.in ImageMagick.new/utilities/ImageMagick.1.in
---- ImageMagick/utilities/ImageMagick.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/ImageMagick.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -5,7 +5,7 @@
- \fBconvert\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
- .SH OVERVIEW
- 
--ImageMagick®, is a software suite to create, edit, and compose bitmap images. It can read, convert and write images in a variety of formats (about 100) including GIF, JPEG, JPEG-2000, PNG, PDF, PhotoCD, TIFF, and DPX. Use ImageMagick to translate, flip, mirror, rotate, scale, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and B\\['e]zier curves.
-+ImageMagick\[rg], is a software suite to create, edit, and compose bitmap images. It can read, convert and write images in a variety of formats (about 100) including GIF, JPEG, JPEG-2000, PNG, PDF, PhotoCD, TIFF, and DPX. Use ImageMagick to translate, flip, mirror, rotate, scale, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and B\\['e]zier curves.
- 
- ImageMagick is free software delivered as a ready-to-run binary distribution or as source code that you can freely use, copy, modify, and distribute. Its license is compatible with the GPL. It runs on all major operating systems.
- 
-@@ -62,7 +62,7 @@
- interprets and executes scripts written in the Magick Scripting Language (MSL).
- .PP
- For more information about the ImageMagick, point your browser to file://@DOCUMENTATION_PATH@/index.html or http://www.imagemagick.org/.
--.SH SEE-ALSO
-+.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
-diff -ur ImageMagick/utilities/import.1.in ImageMagick.new/utilities/import.1.in
---- ImageMagick/utilities/import.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/import.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,84 +10,84 @@
- For more information about the import command, point your browser to file://@DOCUMENTATION_PATH@/www/import.html or http://www.imagemagick.org/script/import.php.
- .SH DESCRIPTION
- Image Settings:
--  -adjoin              join images into a single multi-image file
--  -channel type        apply option to select image channels
--  -colorspace type     alternate image colorspace
--  -comment string      annotate image with comment
--  -compress type       type of pixel compression when writing the image
--  -define format:option
-+  \-adjoin              join images into a single multi-image file
-+  \-channel type        apply option to select image channels
-+  \-colorspace type     alternate image colorspace
-+  \-comment string      annotate image with comment
-+  \-compress type       type of pixel compression when writing the image
-+  \-define format:option
-                        define one or more image format options
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -descend             obtain image by descending window hierarchy
--  -display server      X server to contact
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -delay value         display the next image after pausing
--  -encipher filename   convert plain pixels to cipher pixels
--  -endian type         endianness (MSB or LSB) of the image
--  -encoding type       text encoding type
--  -format "string"     output formatted image characteristics
--  -frame               include window manager frame
--  -gravity direction   which direction to gravitate towards
--  -identify            identify the format and characteristics of the image
--  -interlace type      None, Line, Plane, or Partition
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    Area, Disk, Map, or Memory resource limit
--  -monitor             monitor progress
--  -page geometry       size and location of an image canvas
--  -pause value         seconds delay between snapshots
--  -pointsize value     font point size
--  -quality value       JPEG/MIFF/PNG compression level
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-descend             obtain image by descending window hierarchy
-+  \-display server      X server to contact
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-delay value         display the next image after pausing
-+  \-encipher filename   convert plain pixels to cipher pixels
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-encoding type       text encoding type
-+  \-format "string"     output formatted image characteristics
-+  \-frame               include window manager frame
-+  \-gravity direction   which direction to gravitate towards
-+  \-identify            identify the format and characteristics of the image
-+  \-interlace type      None, Line, Plane, or Partition
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    Area, Disk, Map, or Memory resource limit
-+  \-monitor             monitor progress
-+  \-page geometry       size and location of an image canvas
-+  \-pause value         seconds delay between snapshots
-+  \-pointsize value     font point size
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scene value         image scene number
--  -screen              select image from root window
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set property value  set an image property
--  -silent              operate silently, i.e. don't ring any bells 
--  -snaps value         number of screen snapshots
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -transparent-color color
-+  \-scene value         image scene number
-+  \-screen              select image from root window
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set property value  set an image property
-+  \-silent              operate silently, i.e. don't ring any bells 
-+  \-snaps value         number of screen snapshots
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-transparent-color color
-                        transparent color
--  -treedepth value     color tree depth
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-treedepth value     color tree depth
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        Constant, Edge, Mirror, or Tile
--  -window id           select window with this id or name
-+  \-window id           select window with this id or name
- 
- Image Operators:
--  -annotate geometry text
-+  \-annotate geometry text
-                        annotate the image with text
--  -border              include image borders in the output image
--  -colors value        preferred number of colors in the image
--  -crop geometry       preferred size and location of the cropped image
--  -geometry geometry   perferred size or location of the image
--  -help                print program options
--  -monochrome          transform image to black and white
--  -negate              replace every pixel with its complementary color 
--  -repage geometry     size and location of an image canvas
--  -quantize colorspace reduce colors in this colorspace
--  -resize geometry     resize the image
--  -rotate degrees      apply Paeth rotation to the image
--  -strip               strip image of all profiles and comments
--  -thumbnail geometry  create a thumbnail of the image
--  -transparent color   make this color transparent within the image
--  -trim                trim image edges
--  -type type           image type
-+  \-border              include image borders in the output image
-+  \-colors value        preferred number of colors in the image
-+  \-crop geometry       preferred size and location of the cropped image
-+  \-geometry geometry   perferred size or location of the image
-+  \-help                print program options
-+  \-monochrome          transform image to black and white
-+  \-negate              replace every pixel with its complementary color 
-+  \-repage geometry     size and location of an image canvas
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-resize geometry     resize the image
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-strip               strip image of all profiles and comments
-+  \-thumbnail geometry  create a thumbnail of the image
-+  \-transparent color   make this color transparent within the image
-+  \-trim                trim image edges
-+  \-type type           image type
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, 'file' is written in the MIFF image format.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/mogrify.1.in ImageMagick.new/utilities/mogrify.1.in
---- ImageMagick/utilities/mogrify.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/mogrify.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,217 +10,217 @@
- For more information about the mogrify command, point your browser to file://@DOCUMENTATION_PATH@/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
- .SH DESCRIPTION
- Image Settings:
--  -adjoin              join images into a single multi-image file
--  -affine matrix       affine transform matrix
--  -antialias           remove pixel-aliasing
--  -authenticate value  decrypt image with this password
--  -background color    background color
--  -bias value          add bias when convolving an image
--  -black-point-compensation
-+  \-adjoin              join images into a single multi-image file
-+  \-affine matrix       affine transform matrix
-+  \-antialias           remove pixel-aliasing
-+  \-authenticate value  decrypt image with this password
-+  \-background color    background color
-+  \-bias value          add bias when convolving an image
-+  \-black-point-compensation
-                        use black point compensation
--  -blue-primary point  chromaticity blue primary point
--  -bordercolor color   border color
--  -caption string      assign a caption to an image
--  -channel type        apply option to select image channels
--  -colors value        preferred number of colors in the image
--  -colorspace type     alternate image colorspace
--  -comment string      annotate image with comment
--  -compose operator    set image composite operator
--  -compress type       type of pixel compression when writing the image
--  -decipher filename   convert cipher pixels to plain pixels
--  -define format:option
-+  \-blue-primary point  chromaticity blue primary point
-+  \-bordercolor color   border color
-+  \-caption string      assign a caption to an image
-+  \-channel type        apply option to select image channels
-+  \-colors value        preferred number of colors in the image
-+  \-colorspace type     alternate image colorspace
-+  \-comment string      annotate image with comment
-+  \-compose operator    set image composite operator
-+  \-compress type       type of pixel compression when writing the image
-+  \-decipher filename   convert cipher pixels to plain pixels
-+  \-define format:option
-                        define one or more image format options
--  -delay value         display the next image after pausing
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -display server      get image or font from this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -encipher filename   convert plain pixels to cipher pixels
--  -encoding type       text encoding type
--  -endian type         endianness (MSB or LSB) of the image
--  -family name         render text with this font family
--  -fill color          color to use when filling a graphic primitive
--  -filter type         use this filter when resizing an image
--  -flatten             flatten a sequence of images
--  -font name           render text with this font
--  -format type         image format type
--  -fuzz distance       colors within this distance are considered equal
--  -gravity type        horizontal and vertical text placement
--  -green-primary point chromaticity green primary point
--  -intent type         type of rendering intent when managing the image color
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    pixel cache resource limit
--  -loop iterations     add Netscape loop extension to your GIF animation
--  -mask filename       associate a mask with the image
--  -matte               store matte channel if the image has one
--  -mattecolor color    frame color
--  -monitor             monitor progress
--  -orient type         image orientation
--  -origin geometry     image origin
--  -page geometry       size and location of an image canvas (setting)
--  -path path           write images to this path on disk
--  -ping                efficiently determine image attributes
--  -pointsize value     font point size
--  -preview type        image preview type
--  -quality value       JPEG/MIFF/PNG compression level
--  -quiet               suppress all warning messages
--  -red-primary point   chromaticity red primary point
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-delay value         display the next image after pausing
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-display server      get image or font from this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-encipher filename   convert plain pixels to cipher pixels
-+  \-encoding type       text encoding type
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-family name         render text with this font family
-+  \-fill color          color to use when filling a graphic primitive
-+  \-filter type         use this filter when resizing an image
-+  \-flatten             flatten a sequence of images
-+  \-font name           render text with this font
-+  \-format type         image format type
-+  \-fuzz distance       colors within this distance are considered equal
-+  \-gravity type        horizontal and vertical text placement
-+  \-green-primary point chromaticity green primary point
-+  \-intent type         type of rendering intent when managing the image color
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    pixel cache resource limit
-+  \-loop iterations     add Netscape loop extension to your GIF animation
-+  \-mask filename       associate a mask with the image
-+  \-matte               store matte channel if the image has one
-+  \-mattecolor color    frame color
-+  \-monitor             monitor progress
-+  \-orient type         image orientation
-+  \-origin geometry     image origin
-+  \-page geometry       size and location of an image canvas (setting)
-+  \-path path           write images to this path on disk
-+  \-ping                efficiently determine image attributes
-+  \-pointsize value     font point size
-+  \-preview type        image preview type
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quiet               suppress all warning messages
-+  \-red-primary point   chromaticity red primary point
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scene value         image scene number
--  -seed value          seed a new sequence of pseudo-random numbers
--  -size geometry       width and height of image
--  -stretch type        render text with this font stretch
--  -stroke color        graphic primitive stroke color
--  -strokewidth value   graphic primitive stroke width
--  -style type          render text with this font style
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -texture filename    name of texture to tile onto the image background
--  -tile-offset geometry
-+  \-scene value         image scene number
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-size geometry       width and height of image
-+  \-stretch type        render text with this font stretch
-+  \-stroke color        graphic primitive stroke color
-+  \-strokewidth value   graphic primitive stroke width
-+  \-style type          render text with this font style
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-texture filename    name of texture to tile onto the image background
-+  \-tile-offset geometry
-                        tile offset
--  -treedepth value     color tree depth
--  -transparent-color color
-+  \-treedepth value     color tree depth
-+  \-transparent-color color
-                        transparent color
--  -undercolor color    annotation bounding box color
--  -units type          the units of image resolution
--  -verbose             print detailed information about the image
--  -view                FlashPix viewing transforms
--  -virtual-pixel method
-+  \-undercolor color    annotation bounding box color
-+  \-units type          the units of image resolution
-+  \-verbose             print detailed information about the image
-+  \-view                FlashPix viewing transforms
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -weight type         render text with this font weight
--  -white-point point   chromaticity white point
-+  \-weight type         render text with this font weight
-+  \-white-point point   chromaticity white point
- 
- Image Operators:
--  -adaptive-blur geometry
-+  \-adaptive-blur geometry
-                        adaptively blur pixels; decrease effect near edges
--  -adaptive-resize geometry
-+  \-adaptive-resize geometry
-                        adaptively resize image with data dependent triangulation
--  -adaptive-sharpen geometry
-+  \-adaptive-sharpen geometry
-                        adaptively sharpen pixels; increase effect near edges
--  -annotate geometry text
-+  \-annotate geometry text
-                        annotate the image with text
--  -auto-orient         automatically orient image
--  -black-threshold value
-+  \-auto-orient         automatically orient image
-+  \-black-threshold value
-                        force all pixels below the threshold into black
--  -blur geometry       reduce image noise and reduce detail levels
--  -border geometry     surround image with a border of color
--  -charcoal radius     simulate a charcoal drawing
--  -chop geometry       remove pixels from the image interior
--  -clip                clip along the first path from the 8BIM profile
--  -clip-mask filename  associate a clip mask with the image
--  -clip-path id        clip along a named path from the 8BIM profile
--  -colorize value      colorize the image with the fill color
--  -contrast            enhance or reduce the image contrast
--  -contrast-stretch geometry
-+  \-blur geometry       reduce image noise and reduce detail levels
-+  \-border geometry     surround image with a border of color
-+  \-charcoal radius     simulate a charcoal drawing
-+  \-chop geometry       remove pixels from the image interior
-+  \-clip                clip along the first path from the 8BIM profile
-+  \-clip-mask filename  associate a clip mask with the image
-+  \-clip-path id        clip along a named path from the 8BIM profile
-+  \-colorize value      colorize the image with the fill color
-+  \-contrast            enhance or reduce the image contrast
-+  \-contrast-stretch geometry
-                        improve contrast by `stretching' the intensity range
--  -convolve coefficients
-+  \-convolve coefficients
-                        apply a convolution kernel to the image
--  -cycle amount        cycle the image colormap
--  -despeckle           reduce the speckles within an image
--  -draw string         annotate the image with a graphic primitive
--  -edge radius         apply a filter to detect edges in the image
--  -emboss radius       emboss an image
--  -enhance             apply a digital filter to enhance a noisy image
--  -equalize            perform histogram equalization to an image
--  -evaluate operator value
-+  \-cycle amount        cycle the image colormap
-+  \-despeckle           reduce the speckles within an image
-+  \-draw string         annotate the image with a graphic primitive
-+  \-edge radius         apply a filter to detect edges in the image
-+  \-emboss radius       emboss an image
-+  \-enhance             apply a digital filter to enhance a noisy image
-+  \-equalize            perform histogram equalization to an image
-+  \-evaluate operator value
-                        evaluate an arithmetic, relational, or logical expression
--  -extent geometry     set the image size
--  -extract geometry    extract area from image
--  -flip                flip image vertically
--  -floodfill geometry color
-+  \-extent geometry     set the image size
-+  \-extract geometry    extract area from image
-+  \-flip                flip image vertically
-+  \-floodfill geometry color
-                        floodfill the image with color
--  -flop                flop image horizontally
--  -frame geometry      surround image with an ornamental border
--  -gamma value         level of gamma correction
--  -gaussian-blur geometry
-+  \-flop                flop image horizontally
-+  \-frame geometry      surround image with an ornamental border
-+  \-gamma value         level of gamma correction
-+  \-gaussian-blur geometry
-                        reduce image noise and reduce detail levels
--  -geometry geometry   perferred size or location of the image
--  -help                print program options
--  -identify            identify the format and characteristics of the image
--  -implode amount      implode image pixels about the center
--  -lat geometry        local adaptive thresholding
--  -layers method       optimize or compare image layers
--  -level value         adjust the level of image contrast
--  -linear-stretch geometry
-+  \-geometry geometry   perferred size or location of the image
-+  \-help                print program options
-+  \-identify            identify the format and characteristics of the image
-+  \-implode amount      implode image pixels about the center
-+  \-lat geometry        local adaptive thresholding
-+  \-layers method       optimize or compare image layers
-+  \-level value         adjust the level of image contrast
-+  \-linear-stretch geometry
-                        improve contrast by `stretching with saturation' the intensity range
--  -median radius       apply a median filter to the image
--  -modulate value      vary the brightness, saturation, and hue
--  -monochrome          transform image to black and white
--  -motion-blur geometry
-+  \-median radius       apply a median filter to the image
-+  \-modulate value      vary the brightness, saturation, and hue
-+  \-monochrome          transform image to black and white
-+  \-motion-blur geometry
-                        simulate motion blur
--  -negate              replace every pixel with its complementary color 
--  -noise radius        add or reduce noise in an image
--  -normalize           transform image to span the full range of colors
--  -opaque color        change this color to the fill color
--  -ordered-dither NxN
-+  \-negate              replace every pixel with its complementary color 
-+  \-noise radius        add or reduce noise in an image
-+  \-normalize           transform image to span the full range of colors
-+  \-opaque color        change this color to the fill color
-+  \-ordered-dither NxN
-                        add a noise pattern to the image with specific amplitudes
--  -paint radius        simulate an oil painting
--  -polaroid angle      simulate a Polaroid picture
--  -posterize levels    reduce the image to a limited number of color levels
--  -print string        interpret string and print to console
--  -profile filename    add, delete, or apply an image profile
--  -quantize colorspace reduce colors in this colorspace
--  -radial-blur angle   radial blur the image
--  -raise value         lighten/darken image edges to create a 3-D effect
--  -random-threshold low,high
-+  \-paint radius        simulate an oil painting
-+  \-polaroid angle      simulate a Polaroid picture
-+  \-posterize levels    reduce the image to a limited number of color levels
-+  \-print string        interpret string and print to console
-+  \-profile filename    add, delete, or apply an image profile
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-radial-blur angle   radial blur the image
-+  \-raise value         lighten/darken image edges to create a 3-D effect
-+  \-random-threshold low,high
-                        random threshold the image
--  -recolor matrix      translate, scale, shear, or rotate image colors
--  -region geometry     apply options to a portion of the image
--  -render              render vector graphics
--  -repage geometry     size and location of an image canvas
--  -resample geometry   change the resolution of an image
--  -resize geometry     resize the image
--  -roll geometry       roll an image vertically or horizontally
--  -rotate degrees      apply Paeth rotation to the image
--  -sample geometry     scale image with pixel sampling
--  -scale geometry      scale the image
--  -segment values      segment an image
--  -sepia-tone threshold
-+  \-recolor matrix      translate, scale, shear, or rotate image colors
-+  \-region geometry     apply options to a portion of the image
-+  \-render              render vector graphics
-+  \-repage geometry     size and location of an image canvas
-+  \-resample geometry   change the resolution of an image
-+  \-resize geometry     resize the image
-+  \-roll geometry       roll an image vertically or horizontally
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-sample geometry     scale image with pixel sampling
-+  \-scale geometry      scale the image
-+  \-segment values      segment an image
-+  \-sepia-tone threshold
-                        simulate a sepia-toned photo
--  -set property value  set an image property
--  -shade degrees       shade the image using a distant light source
--  -shadow geometry     simulate an image shadow
--  -sharpen geometry    sharpen the image
--  -shave geometry      shave pixels from the image edges
--  -shear geometry      slide one edge of the image along the X or Y axis
--  -sigmoidal-contrast geometry
-+  \-set property value  set an image property
-+  \-shade degrees       shade the image using a distant light source
-+  \-shadow geometry     simulate an image shadow
-+  \-sharpen geometry    sharpen the image
-+  \-shave geometry      shave pixels from the image edges
-+  \-shear geometry      slide one edge of the image along the X or Y axis
-+  \-sigmoidal-contrast geometry
-                        lightness rescaling using sigmoidal contrast enhancement
--  -sketch geometry     simulate a pencil sketch
--  -solarize threshold  negate all pixels above the threshold level
--  -splice geometry     splice the background color into the image
--  -spread amount       displace image pixels by a random amount
--  -strip               strip image of all profiles and comments
--  -swirl degrees       swirl image pixels about the center
--  -threshold value     threshold the image
--  -thumbnail geometry  create a thumbnail of the image
--  -tile filename       tile image when filling a graphic primitive
--  -tint value          tint the image with the fill color
--  -transform           affine transform image
--  -transparent color   make this color transparent within the image
--  -transpose           flip image vertically and rotate 90 degrees
--  -transverse          flop image horizontally and rotate 270 degrees
--  -trim                trim image edges
--  -type type           image type
--  -unique-colors       discard all but one of any pixel color
--  -unsharp geometry    sharpen the image
--  -vignette geometry   soften the edges of the image in vignette style
--  -wave geometry       alter an image along a sine wave
--  -white-threshold value
-+  \-sketch geometry     simulate a pencil sketch
-+  \-solarize threshold  negate all pixels above the threshold level
-+  \-splice geometry     splice the background color into the image
-+  \-spread amount       displace image pixels by a random amount
-+  \-strip               strip image of all profiles and comments
-+  \-swirl degrees       swirl image pixels about the center
-+  \-threshold value     threshold the image
-+  \-thumbnail geometry  create a thumbnail of the image
-+  \-tile filename       tile image when filling a graphic primitive
-+  \-tint value          tint the image with the fill color
-+  \-transform           affine transform image
-+  \-transparent color   make this color transparent within the image
-+  \-transpose           flip image vertically and rotate 90 degrees
-+  \-transverse          flop image horizontally and rotate 270 degrees
-+  \-trim                trim image edges
-+  \-type type           image type
-+  \-unique-colors       discard all but one of any pixel color
-+  \-unsharp geometry    sharpen the image
-+  \-vignette geometry   soften the edges of the image in vignette style
-+  \-wave geometry       alter an image along a sine wave
-+  \-white-threshold value
-                        force all pixels above the threshold into white
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/montage.1.in ImageMagick.new/utilities/montage.1.in
---- ImageMagick/utilities/montage.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/montage.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,109 +10,109 @@
- For more information about the montage command, point your browser to file://@DOCUMENTATION_PATH@/www/montage.html or http://www.imagemagick.org/script/montage.php.
- .SH DESCRIPTION
- Image Settings:
--  -adjoin              join images into a single multi-image file
--  -affine matrix       affine transform matrix
--  -authenticate value  decrypt image with this password
--  -blue-primary point  chromaticity blue primary point
--  -bordercolor color   border color
--  -channel type        apply option to select image channels
--  -colors value        preferred number of colors in the image
--  -colorspace type     alternate image colorsapce
--  -comment string      annotate image with comment
--  -compose operator    composite operator
--  -compress type       type of pixel compression when writing the image
--  -define format:option
-+  \-adjoin              join images into a single multi-image file
-+  \-affine matrix       affine transform matrix
-+  \-authenticate value  decrypt image with this password
-+  \-blue-primary point  chromaticity blue primary point
-+  \-bordercolor color   border color
-+  \-channel type        apply option to select image channels
-+  \-colors value        preferred number of colors in the image
-+  \-colorspace type     alternate image colorsapce
-+  \-comment string      annotate image with comment
-+  \-compose operator    composite operator
-+  \-compress type       type of pixel compression when writing the image
-+  \-define format:option
-                        define one or more image format options
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -display server      query font from this X server
--  -dispose method      layer disposal method
--  -dither method       apply error diffusion to image
--  -draw string         annotate the image with a graphic primitive
--  -encoding type       text encoding type
--  -endian type         endianness (MSB or LSB) of the image
--  -extract geometry    extract area from image
--  -fill color          color to use when filling a graphic primitive
--  -filter type         use this filter when resizing an image
--  -font name           render text with this font
--  -format "string"     output formatted image characteristics
--  -gamma value         level of gamma correction
--  -geometry geometry   preferred tile and border sizes
--  -gravity direction   which direction to gravitate towards
--  -green-primary point chromaticity green primary point
--  -identify            identify the format and characteristics of the image
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -label string        assign a label to an image
--  -limit type value    pixel cache resource limit
--  -matte               store matte channel if the image has one
--  -mattecolor color    frame color
--  -mode type           framing style
--  -monitor             monitor progress
--  -page geometry       size and location of an image canvas (setting)
--  -pointsize value     font point size
--  -profile filename    add, delete, or apply an image profile
--  -quality value       JPEG/MIFF/PNG compression level
--  -quantize colorspace reduce colors in this colorspace
--  -quiet               suppress all warning messages
--  -red-primary point   chromaticity red primary point
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-display server      query font from this X server
-+  \-dispose method      layer disposal method
-+  \-dither method       apply error diffusion to image
-+  \-draw string         annotate the image with a graphic primitive
-+  \-encoding type       text encoding type
-+  \-endian type         endianness (MSB or LSB) of the image
-+  \-extract geometry    extract area from image
-+  \-fill color          color to use when filling a graphic primitive
-+  \-filter type         use this filter when resizing an image
-+  \-font name           render text with this font
-+  \-format "string"     output formatted image characteristics
-+  \-gamma value         level of gamma correction
-+  \-geometry geometry   preferred tile and border sizes
-+  \-gravity direction   which direction to gravitate towards
-+  \-green-primary point chromaticity green primary point
-+  \-identify            identify the format and characteristics of the image
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-label string        assign a label to an image
-+  \-limit type value    pixel cache resource limit
-+  \-matte               store matte channel if the image has one
-+  \-mattecolor color    frame color
-+  \-mode type           framing style
-+  \-monitor             monitor progress
-+  \-page geometry       size and location of an image canvas (setting)
-+  \-pointsize value     font point size
-+  \-profile filename    add, delete, or apply an image profile
-+  \-quality value       JPEG/MIFF/PNG compression level
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-quiet               suppress all warning messages
-+  \-red-primary point   chromaticity red primary point
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -scenes range        image scene range
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set attribute value set an image attribute
--  -shadow              add a shadow beneath a tile to simulate depth
--  -size geometry       width and height of image
--  -stroke color        color to use when stroking a graphic primitive
--  -support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
--  -texture filename    name of texture to tile onto the image background
--  -thumbnail geometry  create a thumbnail of the image
--  -tile geometry       number of tiles per row and column
--  -transparent-color color
-+  \-scenes range        image scene range
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set attribute value set an image attribute
-+  \-shadow              add a shadow beneath a tile to simulate depth
-+  \-size geometry       width and height of image
-+  \-stroke color        color to use when stroking a graphic primitive
-+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
-+  \-texture filename    name of texture to tile onto the image background
-+  \-thumbnail geometry  create a thumbnail of the image
-+  \-tile geometry       number of tiles per row and column
-+  \-transparent-color color
-                        transparent color
--  -treedepth value     color tree depth
--  -trim                trim image edges
--  -units type          the units of image resolution
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-treedepth value     color tree depth
-+  \-trim                trim image edges
-+  \-units type          the units of image resolution
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        virtual pixel access method
--  -white-point point   chromaticity white point
-+  \-white-point point   chromaticity white point
- 
- Image Operators:
-    annotate geometry text
-                        annotate the image with text
--  -blur geometry      reduce image noise and reduce detail levels
--  -border geometry     surround image with a border of color
--  -crop geometry       preferred size and location of the cropped image
--  -flatten             flatten a sequence of images
--  -flip                flip image in the vertical direction
--  -flop                flop image in the horizontal direction
--  -frame geometry      surround image with an ornamental border
--  -monochrome          transform image to black and white
--  -polaroid angle      simulate a Polaroid picture
--  -repage geometry     size and location of an image canvas (operator)
--  -resize geometry     resize the image
--  -rotate degrees      apply Paeth rotation to the image
--  -strip               strip image of all profiles and comments
--  -transform           affine transform image
--  -transparent color   make this color transparent within the image
--  -type type           image type
-+  \-blur geometry      reduce image noise and reduce detail levels
-+  \-border geometry     surround image with a border of color
-+  \-crop geometry       preferred size and location of the cropped image
-+  \-flatten             flatten a sequence of images
-+  \-flip                flip image in the vertical direction
-+  \-flop                flop image in the horizontal direction
-+  \-frame geometry      surround image with an ornamental border
-+  \-monochrome          transform image to black and white
-+  \-polaroid angle      simulate a Polaroid picture
-+  \-repage geometry     size and location of an image canvas (operator)
-+  \-resize geometry     resize the image
-+  \-rotate degrees      apply Paeth rotation to the image
-+  \-strip               strip image of all profiles and comments
-+  \-transform           affine transform image
-+  \-transparent color   make this color transparent within the image
-+  \-type type           image type
- 
- Image Sequence Operators:
--  -coalesce            merge a sequence of images
-+  \-coalesce            merge a sequence of images
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
--In addition to those listed above, you can specify these standard X resources as command line options:  -background, -bordercolor, -borderwidth, -font, -mattecolor, or -title.
-+In addition to those listed above, you can specify these standard X resources as command line options:  \-background, \-bordercolor, \-borderwidth, \-font, \-mattecolor, or \-title.
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/utilities/stream.1.in ImageMagick.new/utilities/stream.1.in
---- ImageMagick/utilities/stream.1.in	2008-11-26 09:28:04.000000000 -0200
-+++ ImageMagick.new/utilities/stream.1.in	2008-12-21 16:46:57.000000000 -0200
-@@ -10,45 +10,45 @@
- For more information about the stream command, point your browser to file://@DOCUMENTATION_PATH@/www/stream.html or http://www.imagemagick.org/script/stream.php.
- .SH DESCRIPTION
- Image Settings:
--  -authenticate value  decrypt image with this password
--  -channel type        apply option to select image channels
--  -colorspace type     alternate image colorspace
--  -compress type       type of pixel compression when writing the image
--  -define format:option
-+  \-authenticate value  decrypt image with this password
-+  \-channel type        apply option to select image channels
-+  \-colorspace type     alternate image colorspace
-+  \-compress type       type of pixel compression when writing the image
-+  \-define format:option
-                        define one or more image format options
--  -density geometry    horizontal and vertical density of the image
--  -depth value         image depth
--  -extract geometry    extract area from image
--  -identify            identify the format and characteristics of the image
--  -interlace type      type of image interlacing scheme
--  -interpolate method  pixel color interpolation method
--  -limit type value    pixel cache resource limit
--  -map components      one or more pixel components
--  -monitor             monitor progress
--  -quantize colorspace reduce colors in this colorspace
--  -quiet               suppress all warning messages
--  -regard-warnings     pay attention to warning messages
--  -sampling-factor geometry
-+  \-density geometry    horizontal and vertical density of the image
-+  \-depth value         image depth
-+  \-extract geometry    extract area from image
-+  \-identify            identify the format and characteristics of the image
-+  \-interlace type      type of image interlacing scheme
-+  \-interpolate method  pixel color interpolation method
-+  \-limit type value    pixel cache resource limit
-+  \-map components      one or more pixel components
-+  \-monitor             monitor progress
-+  \-quantize colorspace reduce colors in this colorspace
-+  \-quiet               suppress all warning messages
-+  \-regard-warnings     pay attention to warning messages
-+  \-sampling-factor geometry
-                        horizontal and vertical sampling factor
--  -seed value          seed a new sequence of pseudo-random numbers
--  -set attribute value set an image attribute
--  -size geometry       width and height of image
--  -storage-type type   pixel storage type
--  -transparent-color color
-+  \-seed value          seed a new sequence of pseudo-random numbers
-+  \-set attribute value set an image attribute
-+  \-size geometry       width and height of image
-+  \-storage-type type   pixel storage type
-+  \-transparent-color color
-                        transparent color
--  -verbose             print detailed information about the image
--  -virtual-pixel method
-+  \-verbose             print detailed information about the image
-+  \-virtual-pixel method
-                        virtual pixel access method
- 
- Miscellaneous Options:
--  -debug events        display copious debugging information
--  -help                print program options
--  -log format          format of debugging information
--  -list type           print a list of supported option arguments
--  -version             print version information
-+  \-debug events        display copious debugging information
-+  \-help                print program options
-+  \-log format          format of debugging information
-+  \-list type           print a list of supported option arguments
-+  \-version             print version information
- 
- By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
--.SH SEE-ALSO
-+.SH SEE ALSO
- ImageMagick(1)
- 
- .SH COPYRIGHT
-diff -ur ImageMagick/wand/MagickWand-config.1 ImageMagick.new/wand/MagickWand-config.1
---- ImageMagick/wand/MagickWand-config.1	2008-03-20 23:15:12.000000000 -0300
-+++ ImageMagick.new/wand/MagickWand-config.1	2008-12-21 17:39:51.000000000 -0200
-@@ -24,7 +24,7 @@
- use:
- 
- .nf
--  MagickWand-config --version
-+  MagickWand-config \-\-version
- .fi
-   
- To compile a program that calls the 
-@@ -32,34 +32,34 @@
- Application Programmer Interface, use:
- 
- .nf
--  cc `MagickWand-config --cflags --cppflags --ldflags --libs` program.c
-+  cc `MagickWand-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c
- .fi
- 
- .SH OPTIONS
- .TP
--.B --cflags
-+.B \-\-cflags
- Print the compiler flags that were used to compile 
- .BR libWand .
- .TP
--.B --cppflags
-+.B \-\-cppflags
- Print the preprocessor flags that are needed to find the
- .B Wand
- C include files and defines to ensure that the Wand data structures match between
- your program and the installed libraries.
- .TP
--.B --exec-prefix
-+.B \-\-exec-prefix
- Print the directory under which target specific binaries and executables are installed.
- .TP
--.B --ldflags
-+.B \-\-ldflags
- Print the linker flags that are needed to link with the
- .B Wand
- library.
- .TP
--.B --libs
-+.B \-\-libs
- Print the linker flags that are needed to link a program with
- .BR libWand .
- .TP
--.B --version
-+.B \-\-version
- Print the version of the
- .B Wand
- distribution to standard output.
-diff -ur ImageMagick/wand/Wand-config.1 ImageMagick.new/wand/Wand-config.1
---- ImageMagick/wand/Wand-config.1	2008-03-20 23:15:12.000000000 -0300
-+++ ImageMagick.new/wand/Wand-config.1	2008-12-21 17:40:12.000000000 -0200
-@@ -24,7 +24,7 @@
- use:
- 
- .nf
--  Wand-config --version
-+  Wand-config \-\-version
- .fi
-   
- To compile a program that calls the 
-@@ -32,34 +32,34 @@
- Application Programmer Interface, use:
- 
- .nf
--  cc `Wand-config --cflags --cppflags --ldflags --libs` program.c
-+  cc `Wand-config \-\-cflags \-\-cppflags \-\-ldflags \-\-libs` program.c
- .fi
- 
- .SH OPTIONS
- .TP
--.B --cflags
-+.B \-\-cflags
- Print the compiler flags that were used to compile 
- .BR libWand .
- .TP
--.B --cppflags
-+.B \-\-cppflags
- Print the preprocessor flags that are needed to find the
- .B Wand
- C include files and defines to ensure that the Wand data structures match between
- your program and the installed libraries.
- .TP
--.B --exec-prefix
-+.B \-\-exec-prefix
- Print the directory under which target specific binaries and executables are installed.
- .TP
--.B --ldflags
-+.B \-\-ldflags
- Print the linker flags that are needed to link with the
- .B Wand
- library.
- .TP
--.B --libs
-+.B \-\-libs
- Print the linker flags that are needed to link a program with
- .BR libWand .
- .TP
--.B --version
-+.B \-\-version
- Print the version of the
- .B Wand
- distribution to standard output.

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2008-12-21 20:01:58 UTC (rev 74)
+++ branches/experimental/debian/patches/series	2008-12-22 20:02:21 UTC (rev 75)
@@ -1 +1 @@
-manpages.patch
+# no patches for now




More information about the pkg-gmagick-svn-commit mailing list