[DRE-commits] [ruby-net-ssh-multi] 03/05: Drop patch: require_mocha_setup.patch. Merged upstream.

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository ruby-net-ssh-multi.

commit 9409c6ba651c5441760404fdb21aef3a0269fa70
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue May 5 13:22:23 2015 +0200

    Drop patch: require_mocha_setup.patch. Merged upstream.
---
 debian/patches/require_mocha_setup.patch | 14 --------------
 debian/patches/series                    |  1 -
 2 files changed, 15 deletions(-)

diff --git a/debian/patches/require_mocha_setup.patch b/debian/patches/require_mocha_setup.patch
deleted file mode 100644
index 6c4304f..0000000
--- a/debian/patches/require_mocha_setup.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Require mocha/setup instead of mocha
- This is the way to ensure Mocha is correctly setup for recent versions.
-Origin: vendor
-Author: Cédric Boutillier <boutil.debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741769
-Last-Update: 2014-03-16
-
---- a/test/common.rb
-+++ b/test/common.rb
-@@ -1,2 +1,2 @@
- require 'test/unit'
--require 'mocha'
-\ No newline at end of file
-+require 'mocha/setup'
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b380ec4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-require_mocha_setup.patch

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