[DRE-commits] [SCM] ruby-mocha.git branch, master, updated. debian/0.11.3-2-20-g57274dd

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit daaa7e6dded98c4fc81a121a23b3df62136cf3da
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Apr 8 08:12:22 2013 +0200

    remove remove_rubygems_stuff_in_minitest_test.patch (not needed anymore)

diff --git a/debian/patches/remove_rubygems_stuff_in_minitest_test.patch b/debian/patches/remove_rubygems_stuff_in_minitest_test.patch
deleted file mode 100644
index 168a229..0000000
--- a/debian/patches/remove_rubygems_stuff_in_minitest_test.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: do not rely on rubygems to load minitest
-Author: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2012-09-11
-
---- a/test/acceptance/minitest_test.rb
-+++ b/test/acceptance/minitest_test.rb
-@@ -3,12 +3,12 @@
- if defined?(MiniTest)
-   $stderr.puts "TODO: Running suite with MiniTest, running the MiniTestAdapterTest results in an error so skipping it for now."
- else
--  begin
--    require 'rubygems'
--    gem 'minitest'
--  rescue Gem::LoadError
--    # MiniTest gem not available
--  end
-+#  begin
-+#    require 'rubygems'
-+#    gem 'minitest'
-+#  rescue Gem::LoadError
-+#    # MiniTest gem not available
-+#  end
- 
-   begin
-     require 'minitest/unit'
diff --git a/debian/patches/series b/debian/patches/series
index 7e19121..025c9ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 add_rubygems_requirement.patch
-remove_rubygems_stuff_in_minitest_test.patch

-- 
ruby-mocha.git