[DRE-commits] [SCM] ruby-mkrf.git branch, master, updated. upstream/0.2.3-16-gc3e579d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 9c33e637a3dcae1a32aa85a4c8ec594bfd330dd0
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Dec 15 18:07:30 2011 +0100

    patch: avoid  manipulations

diff --git a/debian/patches/0200_remove_load_path_manipulations.rb b/debian/patches/0200_remove_load_path_manipulations.rb
new file mode 100644
index 0000000..51a7df4
--- /dev/null
+++ b/debian/patches/0200_remove_load_path_manipulations.rb
@@ -0,0 +1,36 @@
+Description: do not override $LOAD_PATH
+ This ensures that the lib we require is the one installed in debian/ruby-mkrf
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-12-15
+
+--- a/test/abstract_unit.rb
++++ b/test/abstract_unit.rb
+@@ -1,7 +1,8 @@
+-$:.unshift(File.dirname(__FILE__) + '/../lib')
++#$:.unshift(File.dirname(__FILE__) + '/../lib')
+ 
+ require 'test/unit'
+-require File.dirname(__FILE__) + '/../lib/mkrf'
++#require File.dirname(__FILE__) + '/../lib/mkrf'
++require 'mkrf'
+ 
+ $debug = false
+ 
+@@ -41,4 +42,4 @@
+     assert File.exist?(file), "#{file} wasn't created!"
+   end
+   
+-end
+\ No newline at end of file
++end
+--- a/Rakefile
++++ b/Rakefile
+@@ -6,7 +6,7 @@
+ #require 'rubygems'
+ 
+ 
+-$:.unshift(File.dirname(__FILE__) + "/lib")
++#$:.unshift(File.dirname(__FILE__) + "/lib")
+ require 'mkrf'
+ 
+ PKG_NAME      = 'mkrf'
diff --git a/debian/patches/series b/debian/patches/series
index ca7493d..5f82ee1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0100_remove_rubygems.patch
+0200_remove_load_path_manipulations.rb

-- 
ruby-mkrf.git