[DRE-commits] [ruby-bdb] 03/03: Prepare for release

David Suárez deiv-guest at moszumanska.debian.org
Fri Aug 14 19:38:34 UTC 2015


This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository ruby-bdb.

commit 0695f5380e3124b44d881f0d43242f80197ea86d
Author: David Suárez <david.sephirot at gmail.com>
Date:   Fri Aug 14 21:30:08 2015 +0200

    Prepare for release
---
 debian/changelog                                   |  17 +++-
 debian/patches/series                              |   2 +
 ...se-rbconfig-module-instead-of-deprecated-config |  75 +++++++++++++++
 ...-rhash_ifnone-macro-instead-of-deprecated-rhash | 107 +++++++++++++++++++++
 4 files changed, 199 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1737c3b..1ffbda6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-ruby-bdb (0.6.6-2) UNRELEASED; urgency=medium
+ruby-bdb (0.6.6-2) unstable; urgency=medium
 
+  * Team upload
+
+  [ Lucas Nussbaum]
   * Remove myself from Uploaders.
 
- -- Lucas Nussbaum <lucas at debian.org>  Wed, 08 Apr 2015 17:59:40 +0200
+  [ David Suárez ]
+  * debian/control:
+    + Update standards version; no changes needed.
+    + Update Vcs-Browser to use cgit.
+  * debian/patches:
+    + Add 'use-rbconfig-module-instead-of-deprecated-config' patch.
+    + Add 'use-rhash_ifnone-macro-instead-of-deprecated-rhash' patch.
+
+ -- David Suárez <david.sephirot at gmail.com>  Fri, 14 Aug 2015 21:14:55 +0200
 
 ruby-bdb (0.6.6-1) unstable; urgency=medium
 
@@ -19,6 +30,8 @@ ruby-bdb (0.6.6-1) unstable; urgency=medium
       (Closes: #741576)
   * Add patch 'dont-conflict-helpers-with-test-funcs'
   * Add patch 'add-ruby2.1-support'
+
+
   * Drop obsolete 'build-against-libdb' patch
   * Update standards version; no changes needed
   * Change upload urgency to medium
diff --git a/debian/patches/series b/debian/patches/series
index c6e5694..21a9c96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ update-bdb-versions.patch
 fix-integer-overflow-on-bdb_h_hash-callback.patch
 dont-conflict-helpers-with-test-funcs.patch
 add-ruby2.1-support.patch
+use-rbconfig-module-instead-of-deprecated-config
+use-rhash_ifnone-macro-instead-of-deprecated-rhash
diff --git a/debian/patches/use-rbconfig-module-instead-of-deprecated-config b/debian/patches/use-rbconfig-module-instead-of-deprecated-config
new file mode 100644
index 0000000..1f4c97a
--- /dev/null
+++ b/debian/patches/use-rbconfig-module-instead-of-deprecated-config
@@ -0,0 +1,75 @@
+Description: Use RbConfig module instead of deprecated Config one
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2015-08-14
+
+
+--- a/bdbxml1/extconf.rb
++++ b/bdbxml1/extconf.rb
+@@ -1,6 +1,7 @@
+ # VERIFY 'myconfig' then comment this line
+ 
+ require 'mkmf'
++require 'rbconfig'
+ load './myconfig'
+ 
+ $DLDFLAGS ||= ""
+@@ -13,7 +14,7 @@ def addld(key, path, lib)
+ 	     "-l#{lib}"
+ 	  end
+    if path
+-      case Config::CONFIG["arch"]
++      case RbConfig::CONFIG["arch"]
+       when /solaris2/
+ 	 libs = " -L#{path} -R#{path} #{libs}"
+       when /linux/
+--- a/bdbxml2/extconf.rb
++++ b/bdbxml2/extconf.rb
+@@ -1,6 +1,7 @@
+ # VERIFY 'myconfig' then comment this line
+ 
+ require 'mkmf'
++require 'rbconfig'
+ load './myconfig'
+ 
+ $DLDFLAGS ||= ""
+@@ -13,7 +14,7 @@ def addld(key, path, lib)
+ 	     "-l#{lib}"
+ 	  end
+    if path
+-      case Config::CONFIG["arch"]
++      case RbConfig::CONFIG["arch"]
+       when /solaris2/
+ 	 libs = " -L#{path} -R#{path} #{libs}"
+       when /linux/
+--- a/src/extconf.rb
++++ b/src/extconf.rb
+@@ -2,6 +2,7 @@
+ ARGV.collect! {|x| x.sub(/^--with-db-prefix=/, "--with-db-dir=") }
+ 
+ require 'mkmf'
++require 'rbconfig'
+ 
+ if ARGV.include?('--help') || ARGV.include?('-h')
+    puts <<EOT
+@@ -36,16 +37,16 @@ end
+ 
+ if unknown = enable_config("unknown")
+    libs = if CONFIG.key?("LIBRUBYARG_STATIC")
+-	     Config::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
++	     RbConfig::expand(CONFIG["LIBRUBYARG_STATIC"].dup).sub(/^-l/, '')
+ 	  else
+-	     Config::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
++	     RbConfig::expand(CONFIG["LIBRUBYARG"].dup).sub(/lib([^.]*).*/, '\\1')
+ 	  end
+    unknown = find_library(libs, "ruby_init", 
+-			  Config::expand(CONFIG["archdir"].dup))
++			  RbConfig::expand(CONFIG["archdir"].dup))
+ end
+ 
+ inc_dir, lib_dir = dir_config("db", "/usr/include", "/usr/lib")
+-case Config::CONFIG["arch"]
++case RbConfig::CONFIG["arch"]
+ when /solaris2/
+    $DLDFLAGS ||= ""
+    $DLDFLAGS += " -R#{lib_dir}"
diff --git a/debian/patches/use-rhash_ifnone-macro-instead-of-deprecated-rhash b/debian/patches/use-rhash_ifnone-macro-instead-of-deprecated-rhash
new file mode 100644
index 0000000..f43d64c
--- /dev/null
+++ b/debian/patches/use-rhash_ifnone-macro-instead-of-deprecated-rhash
@@ -0,0 +1,107 @@
+Description: Use the RHASH_IFNONE macro instead of deprecated RHASH one
+
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2015-08-14
+
+--- a/src/common.c
++++ b/src/common.c
+@@ -1303,7 +1303,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE v, f = argv[argc - 1];
+ 
+-	if ((v = rb_hash_aref(f, rb_str_new2("txn"))) != RHASH(f)->ifnone) {
++	if ((v = rb_hash_aref(f, rb_str_new2("txn"))) != RHASH_IFNONE(f)) {
+ 	    if (!rb_obj_is_kind_of(v, bdb_cTxn)) {
+ 		rb_raise(bdb_eFatal, "argument of txn must be a transaction");
+ 	    }
+@@ -1316,7 +1316,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+ 	    dbst->options |= envst->options & BDB_NO_THREAD;
+ 	    dbst->marshal = txnst->marshal;
+ 	}
+-	else if ((v = rb_hash_aref(f, rb_str_new2("env"))) != RHASH(f)->ifnone) {
++	else if ((v = rb_hash_aref(f, rb_str_new2("env"))) != RHASH_IFNONE(f)) {
+ 	    if (!rb_obj_is_kind_of(v, bdb_cEnv)) {
+ 		rb_raise(bdb_eFatal, "argument of env must be an environnement");
+ 	    }
+@@ -1330,11 +1330,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE o
+ #if HAVE_CONST_DB_ENCRYPT 
+ 	if (envst && (envst->options & BDB_ENV_ENCRYPT)) {
+ 	    VALUE tmp = rb_str_new2("set_flags");
+-	    if ((v = rb_hash_aref(f, rb_intern("set_flags"))) != RHASH(f)->ifnone) {
++	    if ((v = rb_hash_aref(f, rb_intern("set_flags"))) != RHASH_IFNONE(f)) {
+ 		rb_hash_aset(f, rb_intern("set_flags"), 
+ 			     INT2NUM(NUM2INT(v) | DB_ENCRYPT));
+ 	    }
+-	    else if ((v = rb_hash_aref(f, tmp)) != RHASH(f)->ifnone) {
++	    else if ((v = rb_hash_aref(f, tmp)) != RHASH_IFNONE(f)) {
+ 		rb_hash_aset(f, tmp, INT2NUM(NUM2INT(v) | DB_ENCRYPT));
+ 	    }
+ 	    else {
+@@ -3082,8 +3082,8 @@ bdb_each_kvc(argc, argv, obj, sens, repl
+ 
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE g, f = argv[argc - 1];
+-	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+-	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH_IFNONE(f) ||
++	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH_IFNONE(f)) {
+ 	    flags = NUM2INT(g);
+ 	}
+ 	argc--;
+@@ -3401,8 +3401,8 @@ bdb_clear(int argc, VALUE *argv, VALUE o
+     flags = 0;
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE g, f = argv[argc - 1];
+-	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+-	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH_IFNONE(f) ||
++	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH_IFNONE(f)) {
+ 	    flags = NUM2INT(g);
+ 	}
+ 	argc--;
+@@ -3426,8 +3426,8 @@ bdb_replace(int argc, VALUE *argv, VALUE
+     flags = 0;
+     if (TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE f = argv[argc - 1];
+-	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+-	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH_IFNONE(f) ||
++	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH_IFNONE(f)) {
+ 	    flags = NUM2INT(g);
+ 	}
+ 	argc--;
+--- a/src/cursor.c
++++ b/src/cursor.c
+@@ -29,8 +29,8 @@ bdb_cursor(int argc, VALUE *argv, VALUE
+     flags = 0;
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE g, f = argv[argc - 1];
+-	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+-	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH_IFNONE(f) ||
++	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH_IFNONE(f)) {
+ 	    flags = NUM2INT(g);
+ 	}
+ 	argc--;
+--- a/src/recnum.c
++++ b/src/recnum.c
+@@ -17,7 +17,7 @@ bdb_recnum_init(int argc, VALUE *argv, V
+ 	argc++;
+     }
+     rb_hash_aset(argv[argc - 1], array, INT2FIX(0));
+-    if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) {
++    if (rb_hash_aref(argv[argc - 1], sarray) != RHASH_IFNONE(argv[argc - 1])) {
+ 	rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0));
+     }
+     rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER));
+@@ -697,8 +697,8 @@ bdb_sary_clear(int argc, VALUE *argv, VA
+ 
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE f = argv[argc - 1];
+-	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH(f)->ifnone ||
+-	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH(f)->ifnone) {
++	if ((g = rb_hash_aref(f, rb_intern("flags"))) != RHASH_IFNONE(f) ||
++	    (g = rb_hash_aref(f, rb_str_new2("flags"))) != RHASH_IFNONE(f)) {
+ 	    flags = NUM2INT(g);
+ 	}
+ 	argc--;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-bdb.git



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