[DRE-commits] [ruby-dbi] 02/08: Add patch 'add-ruby2-support.patch'

David Suárez deiv-guest at moszumanska.debian.org
Fri Feb 21 20:36:11 UTC 2014


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

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

commit 254269902d2dbd84cf3a0acc409d2a16568235d4
Author: David Suárez <david.sephirot at gmail.com>
Date:   Mon Feb 17 22:04:39 2014 +0100

    Add patch 'add-ruby2-support.patch'
---
 debian/patches/add-ruby2-support.patch | 38 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/add-ruby2-support.patch b/debian/patches/add-ruby2-support.patch
new file mode 100644
index 0000000..66afdef
--- /dev/null
+++ b/debian/patches/add-ruby2-support.patch
@@ -0,0 +1,38 @@
+Description: Add support for ruby2.0
+
+Bug-Debian: http://bugs.debian.org/735727
+Author: David Suárez <david.sephirot at gmail.com>
+Last-Update: 2014-02-17
+
+--- ruby-dbi-0.4.5.orig/lib/dbi/row.rb
++++ ruby-dbi-0.4.5/lib/dbi/row.rb
+@@ -209,7 +209,7 @@ module DBI
+         end
+ 
+ 
+-        if RUBY_VERSION =~ /^1\.9/
++        if RUBY_VERSION =~ /^(2\.|1\.9)/
+             def __getobj__
+                 @arr
+             end
+--- ruby-dbi-0.4.5.orig/test/dbi/tc_row.rb
++++ ruby-dbi-0.4.5/test/dbi/tc_row.rb
+@@ -251,6 +251,6 @@ class TC_DBI_Row < Test::Unit::TestCase
+          res << r.dup
+       end
+ 
+-      assert_equal res, [["one", 1], ["two", 2], ["three", 3]]
++      assert_equal [["one", 1], ["two", 2], ["three", 3]], res
+    end
+ end
+--- ruby-dbi-0.4.5.orig/test/dbi/tc_types.rb
++++ ruby-dbi-0.4.5/test/dbi/tc_types.rb
+@@ -116,7 +116,7 @@ class TC_DBI_Type < Test::Unit::TestCase
+ 
+         md = "10-11"
+ 
+-        if RUBY_VERSION =~ /^1\.9/
++        if RUBY_VERSION =~ /^(2\.|1\.9)/
+             md = "11-10"
+         end
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6d4cd3e..9227275 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-remove-executables.patch
 0004-update-to-deprecated-3.0.0.patch
 0005-ruby-1.9-compatibility.patch
+add-ruby2-support.patch
\ No newline at end of file

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



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