[DRE-commits] r4930 - in trunk/librmagick-ruby/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2010-03-14 00:35:38 +0000 (Sun, 14 Mar 2010)
New Revision: 4930

Added:
   trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff
Modified:
   trunk/librmagick-ruby/debian/changelog
   trunk/librmagick-ruby/debian/control
   trunk/librmagick-ruby/debian/patches/series
Log:
[librmagick-ruby] Beginnings of a fix for the FTBS, but that does not seem to be enough, as using fonts in the test fails miserably

Modified: trunk/librmagick-ruby/debian/changelog
===================================================================
--- trunk/librmagick-ruby/debian/changelog	2010-03-13 20:16:24 UTC (rev 4929)
+++ trunk/librmagick-ruby/debian/changelog	2010-03-14 00:35:38 UTC (rev 4930)
@@ -1,3 +1,11 @@
+librmagick-ruby (2.13.0-2) NOTWORKINGYET; urgency=low
+
+  * Add debian/patches/fix-missing-MagickLibSubversion.diff to work around
+    missing symbols in the newer image magick libraries (closes: 573620)
+  * Reflect versioned depencencies as a consequence
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 14 Mar 2010 01:22:51 +0100
+
 librmagick-ruby (2.13.0-1) unstable; urgency=low
 
   [ Gunnar Wolf ]

Modified: trunk/librmagick-ruby/debian/control
===================================================================
--- trunk/librmagick-ruby/debian/control	2010-03-13 20:16:24 UTC (rev 4929)
+++ trunk/librmagick-ruby/debian/control	2010-03-14 00:35:38 UTC (rev 4930)
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at softwarelivre.org>, Gunnar Wolf <gwolf at debian.org>, Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), libmagickcore-dev, ruby1.8, ruby1.8-dev, libwmf-bin, ghostscript, gsfonts, cdbs (>= 0.4.33), ruby-pkg-tools (>= 0.13), rdoc, graphviz, quilt, libsetup-ruby1.8 (>= 3.4.1-3), libmagickwand-dev
+Build-Depends: debhelper (>= 5), libmagickcore-dev (>= 7:6.6.0.4-1) ,
+ ruby1.8, ruby1.8-dev, libwmf-bin, ghostscript, gsfonts, cdbs (>= 0.4.33), 
+ ruby-pkg-tools (>= 0.13), rdoc, graphviz, quilt,
+ libsetup-ruby1.8 (>= 3.4.1-3), libmagickwand-dev
 Standards-Version: 3.8.3
 Homepage: http://rmagick.rubyforge.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/librmagick-ruby/

Added: trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff
===================================================================
--- trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff	                        (rev 0)
+++ trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff	2010-03-14 00:35:38 UTC (rev 4930)
@@ -0,0 +1,29 @@
+Index: librmagick-ruby-2.13.0/ext/RMagick/rmpixel.c
+===================================================================
+--- librmagick-ruby-2.13.0.orig/ext/RMagick/rmpixel.c	2010-03-14 01:12:09.298414547 +0100
++++ librmagick-ruby-2.13.0/ext/RMagick/rmpixel.c	2010-03-14 01:12:51.686764394 +0100
+@@ -528,14 +528,16 @@
+         rb_raise(rb_eRangeError, "hue %g out of range [0.0, 360.0)", h);
+     }
+ 
+-    // Ugly way of checking for change in ImageMagick 6.5.6-5 to see whether
+-    // saturation/lightness should be out of 255 or out of 100.
+-    if(MagickLibVersion < 0x656 ||
+-        (MagickLibVersion == 0x656 && strcmp(MagickLibSubversion,"-5") <= 0) )
+-    {
+-      s = s/2.55;
+-      l = l/2.55;
+-    }
++    /* Disabling this check in Debian as we know we'll be running a
++       more recent version anyway. */
++    /* // Ugly way of checking for change in ImageMagick 6.5.6-5 to see whether */
++    /* // saturation/lightness should be out of 255 or out of 100. */
++    /* if(MagickLibVersion < 0x656 || */
++    /*     (MagickLibVersion == 0x656 && strcmp(MagickLibSubversion,"-5") <= 0) ) */
++    /* { */
++    /*   s = s/2.55; */
++    /*   l = l/2.55; */
++    /* } */
+ 
+     memset(name, 0, sizeof(name));
+     if (alpha)

Modified: trunk/librmagick-ruby/debian/patches/series
===================================================================
--- trunk/librmagick-ruby/debian/patches/series	2010-03-13 20:16:24 UTC (rev 4929)
+++ trunk/librmagick-ruby/debian/patches/series	2010-03-14 00:35:38 UTC (rev 4930)
@@ -1,2 +1,3 @@
+fix-missing-MagickLibSubversion.diff
 disable-version-check.diff
 fail-on-doc-failure.dpatch