[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 e31a6c7aaf7e654225b2acf9517d7cb08c99874d
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Nov 19 18:07:49 2011 -0200

    Refresh rubygems patch

diff --git a/debian/patches/0001-remove_rubygems.patch b/debian/patches/0001-remove_rubygems.patch
index 30b92ca..8d5bb6c 100644
--- a/debian/patches/0001-remove_rubygems.patch
+++ b/debian/patches/0001-remove_rubygems.patch
@@ -1,26 +1,56 @@
+From 2c7781716625f4d41b57faa38d139ddd965bba58 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'`
+
+---
+ bin/rake             |    6 ------
+ lib/rake/rdoctask.rb |    3 ---
+ test/helper.rb       |    2 --
+ 3 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/bin/rake b/bin/rake
+index 4e0bbb7..f1ac568 100755
+--- a/bin/rake
++++ b/bin/rake
+@@ -22,12 +22,6 @@
+ # IN THE SOFTWARE.
+ #++
+ 
+-begin
+-  require 'rubygems'
+-  gem 'rake'
+-rescue LoadError
+-end
+-
+ require 'rake'
+ 
+ Rake.application.run
+diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
+index b6ae224..09de272 100644
 --- a/lib/rake/rdoctask.rb
 +++ b/lib/rake/rdoctask.rb
-@@ -2,14 +2,8 @@
- 
- warn 'rake/rdoctask is deprecated.  Use rdoc/task instead (in RDoc 2.4.2+)'
+@@ -4,10 +4,7 @@ if Rake.application
+   Rake.application.deprecate('require \'rake/rdoctask\'', 'require \'rdoc/task\' (in RDoc 2.4.2+)', __FILE__)
+ end
  
 -require 'rubygems'
 -
--begin
+ begin
 -  gem 'rdoc'
--  require 'rdoc'
--  require 'rdoc/task'
--rescue LoadError, Gem::LoadError
--end
-+require 'rdoc'
-+require 'rdoc/task'
- 
- if defined?(RDoc::Task) then
-   module Rake
+   require 'rdoc'
+   require 'rdoc/task'
+ rescue LoadError, Gem::LoadError
+diff --git a/test/helper.rb b/test/helper.rb
+index 65443fc..29162a2 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,4 +1,3 @@
+@@ -1,5 +1,3 @@
 -require 'rubygems'
- require 'minitest/unit'
- require 'flexmock/test_unit_integration'
- require 'minitest/autorun'
+-
+ begin
+   gem 'minitest'
+ rescue Gem::LoadError
+-- 
+1.7.7.3
+

-- 
rake.git