[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 2cd72853b398393a571bb04818be61839543b111
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Mar 26 00:36:00 2012 +0900

    Update changelog
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index 0acd50d..f57f40b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-mathml (0.12.2-1) unstable; urgency=low
+
+  * Imported Upstream version 0.12.2
+  * Update watch: use gemwatch redirector
+  * Drop patches: merged upstream
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org>  Sun, 25 Mar 2012 14:18:52 +0900
+
 ruby-mathml (0.11-3) unstable; urgency=low
 
   * Unapply patches after build
diff --git a/debian/patches/0001-Fix-Rake-Backword-Compatibility.patch b/debian/patches/0001-Fix-Rake-Backword-Compatibility.patch
deleted file mode 100644
index 4bf5eb2..0000000
--- a/debian/patches/0001-Fix-Rake-Backword-Compatibility.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Youhei SASAKI <uwabami at gfd-dennou.org>
-Date: Fri, 23 Mar 2012 13:09:18 +0900
-Subject: Fix Rake Backword Compatibility
-
----
- Rakefile.utirake |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Rakefile.utirake b/Rakefile.utirake
-index 44349e5..c28a474 100644
---- a/Rakefile.utirake
-+++ b/Rakefile.utirake
-@@ -5,12 +5,12 @@
- 
- require "rake/clean"
- require "rake/testtask"
--require "rdoc/task"
-+require "rake/rdoctask"
- require "rake/contrib/rubyforgepublisher"
- require "rubygems/package_task"
- 
- class UtiRake
--	include Rake::DSL
-+	include Rake::DSL if defined?(Rake::DSL)
- 
- 	def self.setup(opt={}, &proc)
- 		ur = new
diff --git a/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch b/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch
deleted file mode 100644
index ac1dffe..0000000
--- a/debian/patches/0002-Fix-RSpec-Matcher-Parse-Error.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 598dc98..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-Rake-Backword-Compatibility.patch
-0002-Fix-RSpec-Matcher-Parse-Error.patch

-- 
ruby-mathml.git