[DRE-commits] [cucumber] 08/11: drop 0005-Integrate-multi_test-code.patch; (build)depend on ruby-multi-test

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository cucumber.

commit 01dda1574afa4694e32f358b76356d16d78ee5ec
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed May 14 21:45:32 2014 +0200

    drop 0005-Integrate-multi_test-code.patch; (build)depend on ruby-multi-test
---
 debian/control                                     |  2 ++
 .../patches/0005-Integrate-multi_test-code.patch   | 26 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 151dc03..d394e70 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                ruby-gherkin (>= 2.12~),
                ruby-json,
                ruby-multi-json (>= 1.7.5~),
+               ruby-multi-test,
                ruby-nokogiri,
                ruby-rspec
 Standards-Version: 3.9.5
@@ -30,6 +31,7 @@ Depends: libjs-jquery,
          ruby-diff-lcs,
          ruby-gherkin (>= 2.12~),
          ruby-multi-json (>= 1.7.5~),
+         ruby-multi-test,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: rake, ruby-nokogiri
diff --git a/debian/patches/0005-Integrate-multi_test-code.patch b/debian/patches/0005-Integrate-multi_test-code.patch
deleted file mode 100644
index df51979..0000000
--- a/debian/patches/0005-Integrate-multi_test-code.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: include code of multi_test gem
- Cucumber upstream released these 16 lines of code as an independent gem
- (multi_test). Instead of packaging them, we just include them here.
- https://github.com/cucumber/multi_test
-Origin: vendor
-Last-Update: 2014-03-11
-
---- a/dev/null
-+++ b/lib/cucumber/multi_test.rb
-@@ -1,0 +1,16 @@
-+module MultiTest
-+  def self.disable_autorun
-+    if defined?(Test::Unit::Runner)
-+      Test::Unit::Runner.module_eval("@@stop_auto_run = true")
-+    end
-+
-+    if defined?(Minitest)
-+      if defined?(Minitest::Unit)
-+        Minitest::Unit.class_eval do
-+          def run(*)
-+          end
-+        end
-+      end
-+    end
-+  end
-+end
diff --git a/debian/patches/series b/debian/patches/series
index 14aa1a0..cd1eb38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch
 0002-Remove-require-rubygems-statements.patch
 0004-Update_default_binary_path.patch
-0005-Integrate-multi_test-code.patch

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