[DRE-commits] [SCM] ruby-factory-girl.git branch, master, updated. upstream/4.2.0-9-gd295bc4

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit d295bc429e0676fb81b0a7a7272e01f6c42950e6
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun May 12 13:17:15 2013 +0530

    remove rubygems require too

diff --git a/debian/changelog b/debian/changelog
index f4f953a..034e27a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-factory-girl (4.2.0-2) UNRELEASED; urgency=low
+
+  * Remove rubygems require too. 
+
+ -- Praveen Arimbrathodiyil <praveen at debian.org>  Sun, 12 May 2013 13:16:14 +0530
+
 ruby-factory-girl (4.2.0-1) unstable; urgency=low
 
   * Initial release (Closes: #624621)
diff --git a/debian/patches/remove-simplecov.patch b/debian/patches/remove-simplecov-rubygems-require.patch
similarity index 67%
rename from debian/patches/remove-simplecov.patch
rename to debian/patches/remove-simplecov-rubygems-require.patch
index 0860106..88f8a2e 100644
--- a/debian/patches/remove-simplecov.patch
+++ b/debian/patches/remove-simplecov-rubygems-require.patch
@@ -7,7 +7,12 @@ Last-Update: 2013-05-09
 
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -5,7 +5,7 @@
+@@ -1,11 +1,11 @@
+ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+ $LOAD_PATH << File.join(File.dirname(__FILE__))
+ 
+-require 'rubygems'
++#require 'rubygems'
  require 'rspec'
  require 'rspec/autorun'
  
diff --git a/debian/patches/series b/debian/patches/series
index 93f0321..efd5b33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove-simplecov.patch
+remove-simplecov-rubygems-require.patch

-- 
ruby-factory-girl.git