[DRE-commits] [ruby-markerb] 05/08: refresh remove-bundler.patch

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-markerb.

commit 8c90841b81ffe06d479fbae202b3a217033903be
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Oct 6 00:49:06 2014 +0200

    refresh remove-bundler.patch
---
 debian/patches/remove-bundler.patch | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/patches/remove-bundler.patch b/debian/patches/remove-bundler.patch
index 5ad3bd4..deb9256 100644
--- a/debian/patches/remove-bundler.patch
+++ b/debian/patches/remove-bundler.patch
@@ -1,8 +1,9 @@
 Description: remove bundler and rubygems
  We use dpkg and apt to satisfy dependencies.
  These are tracked in debian/control
+ Do not also add lib/ to the loadpath
 Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Update: 2013-05-30
+Last-Update: 2014-10-06
 
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
@@ -14,5 +15,14 @@ Last-Update: 2013-05-30
 +#require "bundler"
 +#Bundler.setup
  
- require "test/unit"
+ require "minitest/autorun"
  require "active_support/test_case"
+@@ -10,7 +10,7 @@
+ require "rails/generators"
+ require "rails/generators/test_case"
+ 
+-$:.unshift File.expand_path("../../lib", __FILE__)
++#$:.unshift File.expand_path("../../lib", __FILE__)
+ require "markerb"
+ 
+ # Avoid annoying warning from I18n.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-markerb.git