[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 811f26590de92d8f4deb6ecfb8bc31a7449a8f17
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Dec 15 18:06:45 2011 +0100

    patch: remove requirements on rubygems

diff --git a/debian/patches/0100_remove_rubygems.patch b/debian/patches/0100_remove_rubygems.patch
new file mode 100644
index 0000000..eae7e21
--- /dev/null
+++ b/debian/patches/0100_remove_rubygems.patch
@@ -0,0 +1,35 @@
+Description: remove requirement on rubygems
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2011-12-15
+
+--- a/lib/mkrf/generator.rb
++++ b/lib/mkrf/generator.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'rbconfig'
+ require 'rake/tasklib'
+ 
+--- a/test/sample_files/cpp_bang/ext/mkrf_config.rb
++++ b/test/sample_files/cpp_bang/ext/mkrf_config.rb
+@@ -1,6 +1,6 @@
+-require 'rubygems'
++#require 'rubygems'
+ require 'mkrf'
+ 
+ Mkrf::Generator.new('bang', ["*.cpp"]) do |g|
+   g.ldshared << ' -L/usr/lib -lgcc -lstdc++'
+-end
+\ No newline at end of file
++end
+--- a/Rakefile
++++ b/Rakefile
+@@ -3,7 +3,8 @@
+ require 'rake/packagetask'
+ require 'rake/gempackagetask'
+ require 'rake/rdoctask'
+-require 'rubygems'
++#require 'rubygems'
++
+ 
+ $:.unshift(File.dirname(__FILE__) + "/lib")
+ require 'mkrf'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ca7493d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0100_remove_rubygems.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-mkrf.git