[DRE-commits] [SCM] rake.git branch, master, updated. debian/0.9.2.2-4-10-gaeb6cd6

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit bf5b834a778de5d4d1310531526b048caf6add5e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri May 17 21:42:54 2013 -0300

    debian/patches/0001-remove_rubygems.patch: refresh

diff --git a/debian/patches/0001-remove_rubygems.patch b/debian/patches/0001-remove_rubygems.patch
index a63366e..c86c058 100644
--- a/debian/patches/0001-remove_rubygems.patch
+++ b/debian/patches/0001-remove_rubygems.patch
@@ -9,8 +9,6 @@ Subject: [PATCH] Remove `require 'rubygems'`
  test/helper.rb       |    5 -----
  3 files changed, 1 insertions(+), 15 deletions(-)
 
-diff --git a/bin/rake b/bin/rake
-index 4e0bbb7..f1ac568 100755
 --- a/bin/rake
 +++ b/bin/rake
 @@ -22,12 +22,6 @@
@@ -26,31 +24,11 @@ index 4e0bbb7..f1ac568 100755
  require 'rake'
  
  Rake.application.run
-diff --git a/lib/rake/rdoctask.rb b/lib/rake/rdoctask.rb
-index b6ae224..f8d30a9 100644
---- a/lib/rake/rdoctask.rb
-+++ b/lib/rake/rdoctask.rb
-@@ -4,13 +4,10 @@ if Rake.application
-   Rake.application.deprecate('require \'rake/rdoctask\'', 'require \'rdoc/task\' (in RDoc 2.4.2+)', __FILE__)
- end
- 
--require 'rubygems'
--
- begin
--  gem 'rdoc'
-   require 'rdoc'
-   require 'rdoc/task'
--rescue LoadError, Gem::LoadError
-+rescue LoadError
- end
- 
- # :stopdoc:
-diff --git a/test/helper.rb b/test/helper.rb
-index 65443fc..0828739 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,10 +1,5 @@
+@@ -1,11 +1,6 @@
  require 'rubygems'
+ $:.unshift File.expand_path('../../lib', __FILE__)
  
 -begin
 -  gem 'minitest'
@@ -60,6 +38,3 @@ index 65443fc..0828739 100644
  require 'minitest/autorun'
  require 'rake'
  require 'tmpdir'
--- 
-1.7.7.3
-

-- 
rake.git