[Pkg-gmagick-svn-commit] r33 - trunk/debian/patches

kobras at alioth.debian.org kobras at alioth.debian.org
Thu Jan 10 19:48:00 UTC 2008 

Author: kobras
Date: 2008-01-10 19:48:00 +0000 (Thu, 10 Jan 2008)
New Revision: 33

Modified:
   trunk/debian/patches/manpages.patch
Log:
Unfuzz for current upstream version.


Modified: trunk/debian/patches/manpages.patch
===================================================================
--- trunk/debian/patches/manpages.patch	2008-01-10 18:41:31 UTC (rev 32)
+++ trunk/debian/patches/manpages.patch	2008-01-10 19:48:00 UTC (rev 33)
@@ -1,7 +1,8 @@
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/animate.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/animate.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/animate.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/animate.1.in	2007-12-06 09:34:31.000000000 -0300
-@@ -81,7 +81,7 @@
+Index: imagemagick-6.3.7.9.dfsg1/utilities/animate.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/animate.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/animate.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -86,7 +86,7 @@
  
  Buttons: 
    1    press to map or unmap the Command widget
@@ -10,11 +11,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/compare.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/compare.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/compare.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/compare.1.in	2007-12-06 10:42:07.000000000 -0300
-@@ -48,7 +48,7 @@
-                        virtual pixel access method
+Index: imagemagick-6.3.7.9.dfsg1/utilities/compare.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/compare.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/compare.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -51,7 +51,7 @@
+   -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
@@ -22,11 +24,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/composite.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/composite.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/composite.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/composite.1.in	2007-12-06 09:34:13.000000000 -0300
-@@ -90,7 +90,7 @@
-   -write filename      write images to this file
+Index: imagemagick-6.3.7.9.dfsg1/utilities/composite.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/composite.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/composite.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -93,7 +93,7 @@
+   -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
@@ -34,10 +37,11 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/conjure.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/conjure.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/conjure.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/conjure.1.in	2007-12-06 10:41:31.000000000 -0300
-@@ -23,7 +23,7 @@
+Index: imagemagick-6.3.7.9.dfsg1/utilities/conjure.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/conjure.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/conjure.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -26,7 +26,7 @@
  In additiion, define any key value pairs required by your script.  For example,
  
      conjure -size 100x100 -color blue -foo bar script.msl
@@ -46,11 +50,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/convert.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/convert.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/convert.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/convert.1.in	2007-12-06 10:42:20.000000000 -0300
-@@ -235,7 +235,7 @@
-   -swap indexes        swap two images in the image sequence
+Index: imagemagick-6.3.7.9.dfsg1/utilities/convert.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/convert.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/convert.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -238,7 +238,7 @@
+   -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
@@ -58,10 +63,11 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/display.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/display.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/display.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/display.1.in	2007-12-06 09:33:33.000000000 -0300
-@@ -113,7 +113,7 @@
+Index: imagemagick-6.3.7.9.dfsg1/utilities/display.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/display.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/display.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -116,7 +116,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
@@ -70,11 +76,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/identify.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/identify.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/identify.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/identify.1.in	2007-12-06 09:31:30.000000000 -0300
-@@ -47,7 +47,7 @@
-                        virtual pixel access method
+Index: imagemagick-6.3.7.9.dfsg1/utilities/identify.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/identify.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/identify.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -50,7 +50,7 @@
+   -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
@@ -82,9 +89,10 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/ImageMagick.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/ImageMagick.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/ImageMagick.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/ImageMagick.1.in	2007-12-06 10:50:20.000000000 -0300
+Index: imagemagick-6.3.7.9.dfsg1/utilities/ImageMagick.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/ImageMagick.1.in	2007-12-05 23:22:41.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/ImageMagick.1.in	2008-01-10 20:45:49.000000000 +0100
 @@ -5,7 +5,7 @@
  \fBconvert\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP
  .SH OVERVIEW
@@ -103,10 +111,11 @@
  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 -Naur imagemagick-6.3.7.2.dfsg1/utilities/import.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/import.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/import.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/import.1.in	2007-12-06 09:31:15.000000000 -0300
-@@ -82,7 +82,7 @@
+Index: imagemagick-6.3.7.9.dfsg1/utilities/import.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/import.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/import.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -86,7 +86,7 @@
    -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.
@@ -115,11 +124,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/mogrify.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/mogrify.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/mogrify.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/mogrify.1.in	2007-12-06 10:42:40.000000000 -0300
-@@ -213,7 +213,7 @@
-                        force all pixels above the threshold into white
+Index: imagemagick-6.3.7.9.dfsg1/utilities/mogrify.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/mogrify.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/mogrify.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -217,7 +217,7 @@
+   -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
@@ -127,10 +137,11 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/montage.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/montage.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/montage.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/montage.1.in	2007-12-06 10:42:51.000000000 -0300
-@@ -109,7 +109,7 @@
+Index: imagemagick-6.3.7.9.dfsg1/utilities/montage.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/montage.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/montage.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -112,7 +112,7 @@
  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.
@@ -139,11 +150,12 @@
  ImageMagick(1)
  
  .SH COPYRIGHT
-diff -Naur imagemagick-6.3.7.2.dfsg1/utilities/stream.1.in imagemagick-6.3.7.2.dfsg1.new/utilities/stream.1.in
---- imagemagick-6.3.7.2.dfsg1/utilities/stream.1.in	2007-11-21 22:35:27.000000000 -0300
-+++ imagemagick-6.3.7.2.dfsg1.new/utilities/stream.1.in	2007-12-06 10:43:00.000000000 -0300
-@@ -45,7 +45,7 @@
-                        virtual pixel access method
+Index: imagemagick-6.3.7.9.dfsg1/utilities/stream.1.in
+===================================================================
+--- imagemagick-6.3.7.9.dfsg1.orig/utilities/stream.1.in	2007-12-26 04:10:09.000000000 +0100
++++ imagemagick-6.3.7.9.dfsg1/utilities/stream.1.in	2008-01-10 20:45:49.000000000 +0100
+@@ -48,7 +48,7 @@
+   -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

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