[DRE-commits] [ruby-net-ssh-gateway] 01/01: require mocha/setup. Closes #743083

[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-net-ssh-gateway.

commit 7db902faf09bce37434ab9bdf3bd4680176d725e
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 2 17:07:32 2014 +0200

    require mocha/setup. Closes #743083
---
 debian/changelog                         |  8 ++++++++
 debian/control                           |  2 +-
 debian/patches/require_mocha_setup.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5776cc1..9cae74f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-net-ssh-gateway (1.2.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Require mocha/setup in tests instead of mocha, to correctly initialize
+    ruby-mocha >= 0.13 (Closes: #743083)
+
+ -- Cédric Boutillier <boutil at debian.org>  Wed, 02 Apr 2014 17:06:53 +0200
+
 ruby-net-ssh-gateway (1.2.0-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index f511df7..75546d5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Lucas Nussbaum <lucas at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-mocha, ruby-net-ssh
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-mocha (>= 0.13~), ruby-net-ssh
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-net-ssh-gateway.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-net-ssh-gateway.git;a=summary
diff --git a/debian/patches/require_mocha_setup.patch b/debian/patches/require_mocha_setup.patch
new file mode 100644
index 0000000..c30e21a
--- /dev/null
+++ b/debian/patches/require_mocha_setup.patch
@@ -0,0 +1,16 @@
+Description: require "mocha/setup" to initialize mocha
+ This is the correct way for ruby-mocha >= 0.13
+Origin: vendor
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-04-02
+
+--- a/test/gateway_test.rb
++++ b/test/gateway_test.rb
+@@ -1,6 +1,6 @@
+ # ruby -I../net-ssh/lib -Ilib -Itest -rrubygems test/gateway_test.rb
+ require 'test/unit'
+-require 'mocha'
++require 'mocha/setup'
+ require 'net/ssh/gateway'
+ 
+ class GatewayTest < Test::Unit::TestCase
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b380ec4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+require_mocha_setup.patch

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