[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. debian/4.7.3-1-10-g8b3dcc0

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 8b3dcc0585f2d5ddf486f2a89216c0322477a8ac
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu May 16 16:15:50 2013 +0200

    update load_plugins_noop_ruby18.patch and prepare upload

diff --git a/debian/changelog b/debian/changelog
index 62d57fe..968070c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-minitest (5.0.1-2) unstable; urgency=low
+
+  * update load_plugins_noop_ruby18.patch to make it work with Ruby
+    librairies using specific parts of rubygems
+
+ -- Cédric Boutillier <boutil at debian.org>  Thu, 16 May 2013 16:14:13 +0200
+
 ruby-minitest (5.0.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/load_plugins_noop_ruby18.patch b/debian/patches/load_plugins_noop_ruby18.patch
index c1532fc..ecc4fe5 100644
--- a/debian/patches/load_plugins_noop_ruby18.patch
+++ b/debian/patches/load_plugins_noop_ruby18.patch
@@ -6,13 +6,11 @@ Last-Update: 2013-05-16
 
 --- a/lib/minitest.rb
 +++ b/lib/minitest.rb
-@@ -66,7 +66,8 @@
-   end
+@@ -67,6 +67,7 @@
  
    def self.load_plugins # :nodoc:
--    return unless self.extensions.empty?
-+    return unless self.extensions.empty? 
-+    return if RUBY_VERSION =~ /1\.8/ and !defined?(Gem)
+     return unless self.extensions.empty?
++    return if RUBY_VERSION =~ /1\.8/ and not (defined?(Gem) and Gem.method_defined?(:find_files))
  
      seen = {}
  

-- 
ruby-minitest.git