[DRE-commits] [SCM] ruby-bdb.git branch, debian-sid, updated. debian/0.6.5-1-14-ge3b5802

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 1de3d6818919f9541dcc20e30ff0d3b975d97a2f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 25 10:42:17 2011 +0200

    Disable VERSION_PATCH checks at two more places

diff --git a/debian/patches/dont-check-patch-level.patch b/debian/patches/dont-check-patch-level.patch
index 282a346..b549e6d 100644
--- a/debian/patches/dont-check-patch-level.patch
+++ b/debian/patches/dont-check-patch-level.patch
@@ -1,7 +1,6 @@
-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 @@
+--- a/src/bdb.c
++++ b/src/bdb.c
+@@ -167,7 +167,10 @@ Init_bdb()
      }
      version = rb_tainted_str_new2(db_version(&major, &minor, &patch));
      if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
@@ -13,3 +12,43 @@ diff -Nur -x '*.orig' -x '*~' libdb-ruby-0.6.5/src/bdb.c libdb-ruby-0.6.5.new/sr
          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);
+--- a/bdbxml1/bdbxml.cc
++++ b/bdbxml1/bdbxml.cc
+@@ -2340,15 +2340,13 @@ extern "C" {
+ 	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
+ 	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));
+ 	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
+-	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
+-	    || patch != DB_VERSION_PATCH) {
++	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
+ 	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
+ 		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+ 		     major, minor, patch);
+ 	}
+ 	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
+-	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
+-	    || patch != DBXML_VERSION_PATCH) {
++	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
+ 	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
+ 		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+ 		     major, minor, patch);
+--- a/bdbxml2/bdbxml.cc
++++ b/bdbxml2/bdbxml.cc
+@@ -5536,15 +5536,13 @@ extern "C" {
+ 	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
+ 	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));
+ 	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
+-	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
+-	    || patch != DB_VERSION_PATCH) {
++	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
+ 	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
+ 		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+ 		     major, minor, patch);
+ 	}
+ 	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
+-	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
+-	    || patch != DBXML_VERSION_PATCH) {
++	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
+ 	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
+ 		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+ 		     major, minor, patch);

-- 
ruby-bdb.git