[DRE-commits] [ruby-rack-rewrite] 01/03: require mocha/setup instead of mocha. Closes: #741808

[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-rack-rewrite.

commit bb60628387d62cbcaab11f915b10dc1af99bb8c7
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Apr 3 00:57:33 2014 +0200

    require mocha/setup instead of mocha. Closes: #741808
---
 debian/control                               | 2 +-
 debian/patches/remove-rubygems-bundler.patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 4ee2237..a2360fa 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: Praveen Arimbrathodiyil <praveen at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha, ruby-rack, ruby-shoulda
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha (>= 0.13~), ruby-rack, ruby-shoulda
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rack-rewrite.git
 Vcs-Browser: http://anonscm.debian.org/?p=pkg-ruby-extras/ruby-rack-rewrite.git
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
index ed940a5..6696f9a 100644
--- a/debian/patches/remove-rubygems-bundler.patch
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -20,7 +20,7 @@ Last-Update: 2013-03-20
  
  require 'test/unit'
 +require 'shoulda'
-+require 'mocha'
++require 'mocha/setup'
 +require 'rack'
 +require 'rack/rewrite'
  

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