[DRE-commits] [SCM] ruby-mathml.git branch, master, updated. debian/0.11-2-9-g2cd7285

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 4cd7f549d184baf5fc7cd72fef5643fa1af3a0a2
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Mar 23 13:12:36 2012 +0900

    New patch 0002-Fix-RSpec-Matcher-Parse-Error.patch
    
    Fix RSpec Matcher Parse Error for FTBFS
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch b/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch
new file mode 100644
index 0000000..ac1dffe
--- /dev/null
+++ b/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch
@@ -0,0 +1,33 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 23 Mar 2012 13:11:00 +0900
+Subject: Fix RSpec Matcher Parse Error
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ spec/util.rb |   13 +------------
+ 1 files changed, 1 insertions(+), 12 deletions(-)
+
+diff --git a/spec/util.rb b/spec/util.rb
+index e4365c9..4af6d35 100644
+--- a/spec/util.rb
++++ b/spec/util.rb
+@@ -3,18 +3,7 @@ module MathML
+ 	module Spec
+ 		module Util
+ 			def raise_parse_error(message, done, rest)
+-				RSpec::Matchers::Matcher.new(:raise_parse_error) do
+-					match do |given|
+-						begin
+-							given.call
+-							@error = nil
+-						rescue Exception
+-							@error = $!
+-						end
+-						@error.is_a?(MathML::LaTeX::ParseError) &&
+-							[@error.message, @error.done, @error.rest] == [message, done, rest]
+-					end
+-				end
++        raise_error(message, done + rest)
+ 			end
+ 
+ 			def new_parser
diff --git a/debian/patches/series b/debian/patches/series
index dc75682..598dc98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-fix_old_Rake_Issues
+0001-Fix-Rake-Backword-Compatibility.patch
+0002-Fix-RSpec-Matcher-Parse-Error.patch

-- 
ruby-mathml.git