[DRE-commits] r4529 - in trunk/libdb-ruby/debian: . patches

[Antonio Terceiro]

Author: terceiro-guest
Date: 2010-01-16 15:53:45 +0000 (Sat, 16 Jan 2010)
New Revision: 4529

Added:
   trunk/libdb-ruby/debian/patches/dont-check-patch-level.patch
Modified:
   trunk/libdb-ruby/debian/changelog
Log:
Making version checking less strict (ignore patch level)



Modified: trunk/libdb-ruby/debian/changelog
===================================================================
--- trunk/libdb-ruby/debian/changelog	2010-01-15 19:00:00 UTC (rev 4528)
+++ trunk/libdb-ruby/debian/changelog	2010-01-16 15:53:45 UTC (rev 4529)
@@ -1,3 +1,10 @@
+libdb-ruby (0.6.5-5) unstable; urgency=low
+
+  * debian/patches/dont-check-patch-level.patch: ignore patch level when
+    checking for version compatibility with libdb4.8. (Closes: #556576)
+
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sat, 16 Jan 2010 12:43:36 -0300
+
 libdb-ruby (0.6.5-4) unstable; urgency=low
 
   [ Gunnar Wolf ]

Added: trunk/libdb-ruby/debian/patches/dont-check-patch-level.patch
===================================================================
--- trunk/libdb-ruby/debian/patches/dont-check-patch-level.patch	                        (rev 0)
+++ trunk/libdb-ruby/debian/patches/dont-check-patch-level.patch	2010-01-16 15:53:45 UTC (rev 4529)
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' libdb-ruby-0.6.5/src/bdb.c libdb-ruby-0.6.5.new/src/bdb.c
+--- libdb-ruby-0.6.5/src/bdb.c	2008-06-27 08:39:55.000000000 -0300
++++ libdb-ruby-0.6.5.new/src/bdb.c	2010-01-16 12:30:01.000000000 -0300
+@@ -167,7 +167,10 @@
+     }
+     version = rb_tainted_str_new2(db_version(&major, &minor, &patch));
+     if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
+-	|| patch != DB_VERSION_PATCH) {
++	/* Antonio Terceiro: don't check patch level and let the shared
++	 * libraries system deal with the versioning through SONAME.
++	 * */
++       ) {
+         rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",
+ 		 DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+ 		 major, minor, patch);