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

Ondřej Surý ondrej at sury.org
Wed May 25 12:39:08 UTC 2011


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

    Import libdb-ruby patches

diff --git a/debian/patches/build-against-libdb-4.8.patch b/debian/patches/build-against-libdb-4.8.patch
new file mode 100644
index 0000000..51ae961
--- /dev/null
+++ b/debian/patches/build-against-libdb-4.8.patch
@@ -0,0 +1,11 @@
+--- libdb-ruby-0.6.5.old/src/extconf.rb	2009-12-12 21:54:13.000000000 -0300
++++ libdb-ruby-0.6.5/src/extconf.rb	2009-12-12 22:02:25.000000000 -0300
+@@ -63,7 +63,7 @@
+    $LDFLAGS += " -lpthread"
+ end
+ 
+-version  = with_config('db-version', "-4.7,47,-4.6,46,-4.5,45,-4.4,44,-4.3,43,-4.2,42,-4.1,41,-4.0,-4,40,4,3,2,").split(/,/, -1)
++version  = with_config('db-version', "-4.8,48,-4.7,47,-4.6,46,-4.5,45,-4.4,44,-4.3,43,-4.2,42,-4.1,41,-4.0,-4,40,4,3,2,").split(/,/, -1)
+ version << "" if version.empty?
+ 
+ catch(:done) do
diff --git a/debian/patches/doc-in-a-single-dir.patch b/debian/patches/doc-in-a-single-dir.patch
new file mode 100644
index 0000000..e784ff2
--- /dev/null
+++ b/debian/patches/doc-in-a-single-dir.patch
@@ -0,0 +1,56 @@
+diff -Nur -x '*.orig' -x '*~' libdb-ruby-0.6.5/bdb.html libdb-ruby-0.6.5.new/bdb.html
+--- libdb-ruby-0.6.5/bdb.html	2005-02-15 11:06:21.000000000 -0600
++++ libdb-ruby-0.6.5.new/bdb.html	2008-12-09 10:37:05.000000000 -0600
+@@ -37,22 +37,22 @@
+      of the database, or mutable, permitting new records to be inserted
+      between existing records. </li>
+ </ul>
+-<p><a href="docs/env.html">Berkeley DB environnement</a></p>
++<p><a href="env.html">Berkeley DB environnement</a></p>
+ <p>Berkeley DB environment is an encapsulation of one or more databases,
+ log files and shared information about the database environment such
+ as shared memory buffer cache pages.</p>
+ <p>Acces Methods</p>
+ <ul>
+-<li><a href="docs/hashlike.html">Hash like interface</a>
++<li><a href="hashlike.html">Hash like interface</a>
+       these are the common methods for BDB::Btree,
+       BDB::Hash, BDB::Recno, BDB::Queue</li>
+-<li><a href="docs/arraylike.html">Array like interface</a>
++<li><a href="arraylike.html">Array like interface</a>
+       methods for BDB::Recnum</li>
+ </ul>
+-<p><a href="docs/sequence.html">Sequence</a></p>
++<p><a href="sequence.html">Sequence</a></p>
+ <p>A sequence is created with BDB::Common::create_sequence or
+ BDB::Common::open_sequence (only with db >= 4.3)</p>
+-<p><a href="docs/transaction.html">Transaction Manager</a></p>
++<p><a href="transaction.html">Transaction Manager</a></p>
+ <p>The transaction subsystem makes operations atomic, consistent,
+ isolated, and durable in the face of system and application
+ failures. The subsystem requires that the data be properly logged and
+@@ -60,20 +60,20 @@
+ the components necessary to transaction-protect the Berkeley DB access
+ methods and other forms of data may be protected if they are logged
+ and locked appropriately.</p>
+-<p><a href="docs/cursor.html">Cursor operation</a></p>
++<p><a href="cursor.html">Cursor operation</a></p>
+ <p>A database cursor is a sequential pointer to the database entries. It
+ allows traversal of the database and access to duplicate keyed
+ entries.  Cursors are used for operating on collections of records,
+ for iterating over a database, and for saving handles to individual
+ records, so that they can be modified after they have been read.</p>
+-<p>See also iterators in <a href="docs/hashlike.html#each">Acces Methods</a></p>
+-<p><a href="docs/lock.html">Lock system</a></p>
++<p>See also iterators in <a href="hashlike.html#each">Acces Methods</a></p>
++<p><a href="lock.html">Lock system</a></p>
+ <p>The lock subsystem provides interprocess and intraprocess concurrency
+ control mechanisms. While the locking system is used extensively by
+ the Berkeley DB access methods and transaction system, it may also be
+ used as a stand-alone subsystem to provide concurrency control to any
+ set of designated resources.</p>
+-<p><a href="docs/log.html">Logging subsystem</a></p>
++<p><a href="log.html">Logging subsystem</a></p>
+ <p>The logging subsystem is the logging facility used by Berkeley DB. It
+ is largely Berkeley DB specific, although it is potentially useful
+ outside of the Berkeley DB package for applications wanting
diff --git a/debian/patches/dont-check-patch-level.patch b/debian/patches/dont-check-patch-level.patch
new file mode 100644
index 0000000..282a346
--- /dev/null
+++ b/debian/patches/dont-check-patch-level.patch
@@ -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);
diff --git a/debian/patches/fail-make-test-if-tests-fail.patch b/debian/patches/fail-make-test-if-tests-fail.patch
new file mode 100644
index 0000000..a999f9d
--- /dev/null
+++ b/debian/patches/fail-make-test-if-tests-fail.patch
@@ -0,0 +1,12 @@
+diff -Nru libdb-ruby-0.6.5.old/extconf.rb libdb-ruby-0.6.5/extconf.rb
+--- libdb-ruby-0.6.5.old/extconf.rb	2009-12-12 22:14:59.000000000 -0300
++++ libdb-ruby-0.6.5/extconf.rb	2009-12-12 22:15:18.000000000 -0300
+@@ -67,7 +67,7 @@
+    Dir.foreach('tests') do |x|
+       next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
+       next if FileTest.directory?(x)
+-      make.print "\t-#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
++      make.print "\t#{CONFIG['RUBY_INSTALL_NAME']} tests/#{x}\n"
+    end
+ ensure
+    make.close

-- 
ruby-bdb.git



More information about the Pkg-ruby-extras-commits mailing list