[DRE-commits] [SCM] ruby-em-spec.git branch, master, updated. upstream/0.2.6-9-gedbe5ba

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 94f08041d52453b1b5794b8e14f6aa349fc4c8c8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Mar 31 15:31:15 2013 +0530

    correct newline in patch

diff --git a/debian/patches/remove-rubygems-require.patch b/debian/patches/remove-rubygems-require.patch
index 95eac96..a631d0b 100644
--- a/debian/patches/remove-rubygems-require.patch
+++ b/debian/patches/remove-rubygems-require.patch
@@ -1,14 +1,15 @@
 --- a/lib/em-spec/bacon.rb
 +++ b/lib/em-spec/bacon.rb
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,7 @@
  require File.dirname(__FILE__) + '/../ext/fiber18'
 -require 'rubygems'
 +# dependencies are added in debian/control
 +# require 'rubygems'
++
  require 'eventmachine'
  
  module EventMachine
-@@ -93,4 +94,4 @@
+@@ -93,4 +95,4 @@
        $em_spec_fiber.resume if $em_spec_fiber
      }
    end

-- 
ruby-em-spec.git