[Pkg-gmagick-svn-commit] r129 - in trunk/debian: . patches

[Nelson A. de Oliveira]

Author: naoliv
Date: 2010-11-16 16:31:53 +0000 (Tue, 16 Nov 2010)
New Revision: 129

Added:
   trunk/debian/patches/
   trunk/debian/patches/601824.patch
   trunk/debian/patches/series
Modified:
   trunk/debian/changelog
Log:
Fix for #601824


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-11-16 11:43:08 UTC (rev 128)
+++ trunk/debian/changelog	2010-11-16 16:31:53 UTC (rev 129)
@@ -1,3 +1,12 @@
+imagemagick (8:6.6.0.4-3) unstable; urgency=medium
+
+  * Apply fix for reading config files from current directory, found by
+    Jakub Wilk <jwilk at debian.org> (Closes: #601824).
+    Thanks to Andreas Metzler <ametzler at downhill.at.eu.org> for the nicely
+    formatted patch.
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Tue, 16 Nov 2010 10:53:04 -0200
+
 imagemagick (8:6.6.0.4-2.2) unstable; urgency=low
 
   * Non-maintainer upload.

Added: trunk/debian/patches/601824.patch
===================================================================
--- trunk/debian/patches/601824.patch	                        (rev 0)
+++ trunk/debian/patches/601824.patch	2010-11-16 16:31:53 UTC (rev 129)
@@ -0,0 +1,34 @@
+Description: Do not read configure files in the current directory for
+ the "installed" version of ImageMagick.
+ Patch pulled from upstream svn 
+ https://www.imagemagick.org/subversion/ImageMagick/trunk
+ revision 3022.
+Author: Cristy  <quetzlzacatenango at image...>
+Bug-Debian: http://bugs.debian.org/601824
+Origin: upstream
+Last-Update: 2010-11-06
+
+--- imagemagick-6.6.0.4.orig/magick/configure.c
++++ imagemagick-6.6.0.4/magick/configure.c
+@@ -749,6 +749,10 @@ MagickExport LinkedListInfo *GetConfigur
+       (void) AppendValueToLinkedList(paths,ConstantString(path));
+ #endif
+     }
++  /*
++    Search current directory.
++  */
++  (void) AppendValueToLinkedList(paths,ConstantString(""));
+ #endif
+   {
+     char
+@@ -803,10 +807,6 @@ MagickExport LinkedListInfo *GetConfigur
+       }
+   }
+ #endif
+-  /*
+-    Search current directory.
+-  */
+-  (void) AppendValueToLinkedList(paths,ConstantString(""));
+   return(paths);
+ }
+ 

Added: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	                        (rev 0)
+++ trunk/debian/patches/series	2010-11-16 16:31:53 UTC (rev 129)
@@ -0,0 +1 @@
+601824.patch