[DRE-commits] [ruby-fakeweb] 01/03: require mocha/setup instead of mocha. Closes: #741815

[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-fakeweb.

commit 1335210e55d333c5ab311f0e6b65f8ac15fa69b0
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Mar 16 23:26:27 2014 +0100

    require mocha/setup instead of mocha. Closes: #741815
---
 debian/patches/require_mocha_setup.patch | 19 +++++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/require_mocha_setup.patch b/debian/patches/require_mocha_setup.patch
new file mode 100644
index 0000000..a0b0ff9
--- /dev/null
+++ b/debian/patches/require_mocha_setup.patch
@@ -0,0 +1,19 @@
+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: https://github.com/chrisk/fakeweb/issues/46
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741815
+Last-Update: 2014-03-16
+
+--- ruby-fakeweb-1.3.0+dfsg1.orig/test/test_helper.rb
++++ ruby-fakeweb-1.3.0+dfsg1/test/test_helper.rb
+@@ -4,7 +4,7 @@ require 'pathname'
+ require 'fake_web'
+ require 'rbconfig'
+ require 'rubygems'
+-require 'mocha'
++require 'mocha/setup'
+ 
+ 
+ # Give all tests a common setup and teardown that prevents shared state
diff --git a/debian/patches/series b/debian/patches/series
index e3e6747..0f1f653 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_tests_ruby2.0.patch
 deactivate_google_tests.patch
+require_mocha_setup.patch

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