[DRE-commits] [SCM] ruby-net-scp.git branch, master, updated. upstream/1.0.4-14-ge8dcfb6

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 50bda6d0515ff93713aa9dee9686b01a9cb43db5
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jul 2 19:19:52 2013 +0200

    debian/patches/disable-gem-in-tests.patch: Refreshed

diff --git a/debian/changelog b/debian/changelog
index b6c6caa..cda632c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-net-scp (1.1.1-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release
+    - debian/patches/disable-gem-in-tests.patch: Refreshed
 
  -- Laurent Bigonville <bigon at debian.org>  Tue, 02 Jul 2013 19:03:49 +0200
 
diff --git a/debian/patches/disable-gem-in-tests.patch b/debian/patches/disable-gem-in-tests.patch
index 27933d6..837edd2 100644
--- a/debian/patches/disable-gem-in-tests.patch
+++ b/debian/patches/disable-gem-in-tests.patch
@@ -1,22 +1,23 @@
 --- a/test/common.rb
 +++ b/test/common.rb
-@@ -1,10 +1,11 @@
+@@ -1,11 +1,11 @@
  require 'test/unit'
- require 'mocha'
-+ require 'net/ssh'
+ require 'mocha/setup'
  
 -begin
 -  gem 'net-ssh', ">= 2.0.0"
 -  require 'net/ssh'
 -rescue LoadError
+-  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
 +#begin
 +#  gem 'net-ssh', ">= 2.0.0"
 +#  require 'net/ssh'
 +#rescue LoadError
-   $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
++#  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
  
    begin
-@@ -14,7 +15,7 @@ rescue LoadError
+     require 'net/ssh'
+@@ -14,7 +14,7 @@ rescue LoadError
    rescue LoadError => e
      abort "could not load net/ssh v2 (#{e.inspect})"
    end

-- 
ruby-net-scp.git