[DRE-commits] [SCM] ruby-echoe.git branch, master, updated. upstream/4.5.6-6-g71c3e28

[Clint Byrum]

The following commit has been merged in the master branch:
commit 71c3e288decadb3dc849460596feadf17d9198e2
Author: Clint Byrum <clint at ubuntu.com>
Date:   Fri May 20 09:29:34 2011 -0700

    removing unnecessary remove_require_rubygems.patch since rubygems is in fact needed for other parts of the library

diff --git a/debian/patches/remove_require_rubygems.patch b/debian/patches/remove_require_rubygems.patch
deleted file mode 100644
index 7dcd50c..0000000
--- a/debian/patches/remove_require_rubygems.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: echoe-4.5.6/lib/echoe.rb
-===================================================================
---- echoe-4.5.6.orig/lib/echoe.rb	2011-04-29 10:53:09.853563105 -0700
-+++ echoe-4.5.6/lib/echoe.rb	2011-04-29 10:54:24.729245889 -0700
-@@ -18,7 +18,6 @@
- 
- require "#{$HERE}/echoe/extensions"
- 
--require 'rubygems'
- require 'rubyforge'
- 
- Echoe.silence { require 'rubygems/specification' }
-@@ -27,7 +26,7 @@
- begin
-   gem 'gemcutter'
-   require 'rubygems_plugin'
--rescue Gem::LoadError
-+rescue LoadError
- end
- 
- begin; require 'rcov/rcovtask'; rescue LoadError; end
diff --git a/debian/patches/series b/debian/patches/series
index 7185826..81401e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 depend-on-system-rake.patch
-remove_require_rubygems.patch

-- 
ruby-echoe.git