[DRE-commits] [SCM] rake.git branch, master, updated. debian/0.9.2-1-20-ge7bdb9f

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit e7bdb9f9fbea30e524b8c7ea6024719ed3470b76
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Nov 19 18:28:07 2011 -0200

    Refresh rubygems patch

diff --git a/debian/patches/0001-remove_rubygems.patch b/debian/patches/0001-remove_rubygems.patch
index 8d5bb6c..bc8adf1 100644
--- a/debian/patches/0001-remove_rubygems.patch
+++ b/debian/patches/0001-remove_rubygems.patch
@@ -1,4 +1,4 @@
-From 2c7781716625f4d41b57faa38d139ddd965bba58 Mon Sep 17 00:00:00 2001
+From 718c1549773bb188919a70da8167c9675236b58a Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro at debian.org>
 Date: Sat, 19 Nov 2011 18:06:57 -0200
 Subject: [PATCH] Remove `require 'rubygems'`
@@ -6,8 +6,8 @@ Subject: [PATCH] Remove `require 'rubygems'`
 ---
  bin/rake             |    6 ------
  lib/rake/rdoctask.rb |    3 ---
- test/helper.rb       |    2 --
- 3 files changed, 0 insertions(+), 11 deletions(-)
+ test/helper.rb       |    5 -----
+ 3 files changed, 0 insertions(+), 14 deletions(-)
 
 diff --git a/bin/rake b/bin/rake
 index 4e0bbb7..f1ac568 100755
@@ -42,15 +42,20 @@ index b6ae224..09de272 100644
    require 'rdoc/task'
  rescue LoadError, Gem::LoadError
 diff --git a/test/helper.rb b/test/helper.rb
-index 65443fc..29162a2 100644
+index 65443fc..0828739 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,5 +1,3 @@
--require 'rubygems'
+@@ -1,10 +1,5 @@
+ require 'rubygems'
+ 
+-begin
+-  gem 'minitest'
+-rescue Gem::LoadError
+-end
 -
- begin
-   gem 'minitest'
- rescue Gem::LoadError
+ require 'minitest/autorun'
+ require 'rake'
+ require 'tmpdir'
 -- 
 1.7.7.3
 

-- 
rake.git