[DRE-commits] [SCM] ruby-dbd-odbc.git branch, master, updated. upstream/0.2.5-3-g0bb3a68

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit 0bb3a6831f4ae3b385df33f64e099ec36723c74d
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Wed Sep 14 01:17:30 2011 +0300

    patch: remove usage of rubygems

diff --git a/debian/patches/0001-remove-usage-of-rubygems.patch b/debian/patches/0001-remove-usage-of-rubygems.patch
new file mode 100644
index 0000000..00fe2c3
--- /dev/null
+++ b/debian/patches/0001-remove-usage-of-rubygems.patch
@@ -0,0 +1,52 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Wed, 14 Sep 2011 01:17:04 +0300
+Subject: remove usage of rubygems
+
+---
+ lib/dbd/ODBC.rb |    6 ------
+ test/ts_dbd.rb  |   10 +---------
+ 2 files changed, 1 insertions(+), 15 deletions(-)
+
+diff --git a/lib/dbd/ODBC.rb b/lib/dbd/ODBC.rb
+index 2661bf4..c351175 100644
+--- a/lib/dbd/ODBC.rb
++++ b/lib/dbd/ODBC.rb
+@@ -34,12 +34,6 @@ $:.delete(".") # FIXME oh for the love of pete..
+ require "odbc"
+ $: << "."
+ 
+-begin
+-    require 'rubygems'
+-    gem 'dbi'
+-rescue LoadError => e
+-end
+-
+ require 'dbi'
+ 
+ module DBI
+diff --git a/test/ts_dbd.rb b/test/ts_dbd.rb
+index fcd301e..29339f3 100644
+--- a/test/ts_dbd.rb
++++ b/test/ts_dbd.rb
+@@ -1,5 +1,3 @@
+-require 'rubygems'
+-gem 'test-unit'
+ # figure out what tests to run
+ require 'yaml'
+ require 'test/unit/testsuite'
+@@ -96,13 +94,7 @@ if __FILE__ == $0
+     begin
+         require 'dbi'
+     rescue LoadError => e
+-        begin
+-            require 'rubygems'
+-            gem 'dbi'
+-            require 'dbi'
+-        rescue LoadError => e
+-            abort "DBI must already be installed or must come with this package for tests to work."
+-        end
++        abort "DBI must already be installed or must come with this package for tests to work."
+     end
+ 
+     Deprecate.set_action(proc { })
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a8bdcc3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-remove-usage-of-rubygems.patch

-- 
ruby-dbd-odbc.git