[DRE-commits] [SCM] ruby-vegas.git branch, master, updated. debian/0.1.11-1-7-gaec2963

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 8974dc58598c32c31cbc8e909fc44d99f5068c43
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Jun 22 17:57:53 2013 +0000

    update mocha require lines to fix build failures

diff --git a/debian/changelog b/debian/changelog
index fc66e39..c1cb5bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 ruby-vegas (0.1.11-2) UNRELEASED; urgency=low
 
+  * Update mocha require lines (Closes: #713173)
+    - port-to-latest-mocha.patch
+
   [ Cédric Boutillier ]
   * use canonical URI in Vcs-* fields
 
diff --git a/debian/control b/debian/control
index 19e8d26..a45a195 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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~),
- ruby-rack, ruby-bacon, thin, ruby-mocha, ruby-sinatra
+ ruby-rack, ruby-bacon, thin, ruby-mocha (>=0.14), ruby-sinatra
 Standards-Version: 3.9.3
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-vegas.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-vegas.git;a=summary
diff --git a/debian/patches/port-to-latest-mocha.patch b/debian/patches/port-to-latest-mocha.patch
new file mode 100644
index 0000000..d6b6782
--- /dev/null
+++ b/debian/patches/port-to-latest-mocha.patch
@@ -0,0 +1,20 @@
+Description: update mocha require
+ require 'mocha/object' is removed from latest mocha.
+ use require 'mocha/setup' instead.
+Bug: https://github.com/quirkey/vegas/pull/20
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713173
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Last-Update: 2013-06-22
+
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,7 +1,7 @@
+ dependencies = %w{
+   bacon
+-  mocha/standalone
+-  mocha/object
++  mocha/api
++  mocha/setup
+   sinatra
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8d29f0b..38807cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove-rubygems-require.patch
+port-to-latest-mocha.patch

-- 
ruby-vegas.git