[DRE-commits] [ruby-shoulda-context] 01/08: require 'mocha/setup' to correctly initialize mocha >= 0.13

[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-shoulda-context.

commit a597d5f3214ab88c2db95052e020bf8d2476918d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Apr 1 09:41:09 2014 +0200

    require 'mocha/setup' to correctly initialize mocha >= 0.13
---
 debian/control                           |  2 +-
 debian/patches/require_mocha_setup.patch | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b5a6285..c46837b 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: Antonio Terceiro <terceiro at softwarelivre.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha, ruby-test-unit
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-mocha (>= 0.13~), ruby-test-unit
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-shoulda-context.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-shoulda-context.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..ae60103
--- /dev/null
+++ b/debian/patches/require_mocha_setup.patch
@@ -0,0 +1,16 @@
+Description: initialise mocha by requiring mocha/setup
+ This is the correct way since ruby-mocha 0.13 
+Author: Cédric Boutillier <boutil at debian.org>
+Bug-Debian: http://bugs.debian.org/743071
+Last-Update: 2014-04-01
+
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,6 +1,6 @@
+ require 'fileutils'
+ require 'test/unit'
+-require 'mocha'
++require 'mocha/setup'
+ 
+ shoulda_path = File.join(File.dirname(__FILE__), '..', 'lib')
+ $LOAD_PATH << shoulda_path
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-shoulda-context.git