[DRE-commits] [SCM] ruby-dataobjects-mysql.git branch, master, updated. upstream/0.10.7-6-g9652785

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 9ebeb1b21e31fae96eaba203c29726655e77e0cd
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat Nov 5 01:21:21 2011 +0100

    patches: remove rubygems and loadpath manipulation from specs

diff --git a/debian/patches/0010_remove_rubygems_from_specs.patch b/debian/patches/0010_remove_rubygems_from_specs.patch
new file mode 100644
index 0000000..b8124a4
--- /dev/null
+++ b/debian/patches/0010_remove_rubygems_from_specs.patch
@@ -0,0 +1,15 @@
+Description: remove requirement on rubygems in spec_helper
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-10-26
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,7 +1,7 @@
+ $TESTING=true
+ JRUBY = RUBY_PLATFORM =~ /java/
+ 
+-require 'rubygems'
++#require 'rubygems'
+ require 'rspec'
+ require 'date'
+ require 'ostruct'
diff --git a/debian/patches/0020_remove_loadpath_manipulation_in_specs.patch b/debian/patches/0020_remove_loadpath_manipulation_in_specs.patch
new file mode 100644
index 0000000..6a535a4
--- /dev/null
+++ b/debian/patches/0020_remove_loadpath_manipulation_in_specs.patch
@@ -0,0 +1,29 @@
+Description: remove $LOAD_PATH manipulation in specs
+ They should use the copy installed in debian/
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-11-03
+
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -9,15 +9,15 @@
+ require 'win32console' if RUBY_PLATFORM =~ /mingw|mswin/
+ 
+ driver_lib = File.expand_path('../../lib', __FILE__)
+-$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
++#$LOAD_PATH.unshift(driver_lib) unless $LOAD_PATH.include?(driver_lib)
+ 
+ # Prepend data_objects/do_jdbc in the repository to the load path.
+ # DO NOT USE installed gems, except when running the specs from gem.
+-repo_root = File.expand_path('../../..', __FILE__)
+-(['data_objects'] << ('do_jdbc' if JRUBY)).compact.each do |lib|
+-  lib_path = "#{repo_root}/#{lib}/lib"
+-  $LOAD_PATH.unshift(lib_path) if File.directory?(lib_path) && !$LOAD_PATH.include?(lib_path)
+-end
++#repo_root = File.expand_path('../../..', __FILE__)
++#(['data_objects'] << ('do_jdbc' if JRUBY)).compact.each do |lib|
++#  lib_path = "#{repo_root}/#{lib}/lib"
++#  $LOAD_PATH.unshift(lib_path) if File.directory?(lib_path) && !$LOAD_PATH.include?(lib_path)
++#end
+ 
+ require 'data_objects'
+ require 'data_objects/spec/setup'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7348b7a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0010_remove_rubygems_from_specs.patch
+0020_remove_loadpath_manipulation_in_specs.patch
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
ruby-dataobjects-mysql.git