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

[Vincent Fourmond]

Author: fourmond
Date: 2010-01-07 21:50:21 +0000 (Thu, 07 Jan 2010)
New Revision: 4502

Added:
   trunk/librmagick-ruby/debian/patches/disable-version-check.diff
Modified:
   trunk/librmagick-ruby/debian/changelog
   trunk/librmagick-ruby/debian/patches/series
Log:
[librmagick-ruby] Disable runtime checks for version, (in principle) unnecessary and pretty painful

Modified: trunk/librmagick-ruby/debian/changelog
===================================================================
--- trunk/librmagick-ruby/debian/changelog	2010-01-07 21:13:00 UTC (rev 4501)
+++ trunk/librmagick-ruby/debian/changelog	2010-01-07 21:50:21 UTC (rev 4502)
@@ -1,9 +1,16 @@
 librmagick-ruby (2.13.0-1) unstable; urgency=low
 
+  [ Gunnar Wolf ]
   * New upstream release
 
- -- Gunnar Wolf <gwolf at debian.org>  Sun, 27 Dec 2009 23:45:11 -0600
+  [ Vincent Fourmond ]
+  * Adding disable-version-check.diff to disable the runtime version
+    check: proper library versioning should ensure there are no problems
+    at runtime. (closes: #557778, #563893, #560667). Let's hope it will
+    not introduce *more* errors...
 
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 07 Jan 2010 22:19:36 +0100
+
 librmagick-ruby (2.12.2-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/librmagick-ruby/debian/patches/disable-version-check.diff
===================================================================
--- trunk/librmagick-ruby/debian/patches/disable-version-check.diff	                        (rev 0)
+++ trunk/librmagick-ruby/debian/patches/disable-version-check.diff	2010-01-07 21:50:21 UTC (rev 4502)
@@ -0,0 +1,16 @@
+Index: librmagick-ruby-2.13.0/ext/RMagick/rmmain.c
+===================================================================
+--- librmagick-ruby-2.13.0.orig/ext/RMagick/rmmain.c	2010-01-07 22:19:01.000000000 +0100
++++ librmagick-ruby-2.13.0/ext/RMagick/rmmain.c	2010-01-07 22:19:09.000000000 +0100
+@@ -1639,6 +1639,11 @@
+     int x, n;
+     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
+ 
++    /* Vincent Fourmond: disabled by default on Debian as it is
++       obnoxious and unnecessary when appropriate SONAME is set for
++       ImageMagick libraries (which we should assume anyway) */
++    return;
++
+     if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
+     {
+         return;

Modified: trunk/librmagick-ruby/debian/patches/series
===================================================================
--- trunk/librmagick-ruby/debian/patches/series	2010-01-07 21:13:00 UTC (rev 4501)
+++ trunk/librmagick-ruby/debian/patches/series	2010-01-07 21:50:21 UTC (rev 4502)
@@ -1 +1,2 @@
+disable-version-check.diff
 fail-on-doc-failure.dpatch