[DRE-commits] [SCM] ruby-em-http-request.git branch, master, updated. debian/0.3.0-1-9-g80600ae

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit bf263af34f4b355aaf93bc34a4a7558649ef8465
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Nov 18 15:49:31 2012 +0530

    refresh disable_rubygems patch

diff --git a/debian/changelog b/debian/changelog
index 926263d..473cb32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-em-http-request (1.0.3-1) experimental; urgency=low
 
   * Team upload
   * New upstream release
+  * Refresh patch (disable_rubygems->disable-rubygems.patch)
 
  -- Praveen Arimbrathodiyil <praveen at debian.org>  Sun, 18 Nov 2012 15:20:41 +0530
 
diff --git a/debian/patches/diasble-rubygems.patch b/debian/patches/diasble-rubygems.patch
new file mode 100644
index 0000000..4097b1a
--- /dev/null
+++ b/debian/patches/diasble-rubygems.patch
@@ -0,0 +1,9 @@
+--- a/spec/helper.rb
++++ b/spec/helper.rb
+@@ -1,4 +1,5 @@
+-require 'rubygems'
++# We don't need rubygems, dependencies are handled by apt
++# require 'rubygems'
+ require 'bundler/setup'
+ 
+ require 'em-http'
diff --git a/debian/patches/disable_rubygems b/debian/patches/disable_rubygems
deleted file mode 100644
index 797c6ed..0000000
--- a/debian/patches/disable_rubygems
+++ /dev/null
@@ -1,13 +0,0 @@
---- ruby-em-http-request-0.3.0.orig/spec/helper.rb
-+++ ruby-em-http-request-0.3.0/spec/helper.rb
-@@ -1,8 +1,8 @@
--require 'rubygems'
-+#require 'rubygems'
- require 'rspec'
- require 'pp'
- 
- $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-
- require 'em-http'
--require 'em-websocket'
-+#require 'em-websocket'
diff --git a/debian/patches/series b/debian/patches/series
index 87bc203..2ea85fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-disable_rubygems
+diasble-rubygems.patch
 spec_adjust_require

-- 
ruby-em-http-request.git