[DRE-commits] [ruby-solve] 05/06: d/patches: Remove spork usage (ROM)

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-solve.

commit e8964d17c47223eb0e9ba97900bd1073647de901
Author: Sebastien Badia <seb at sebian.fr>
Date:   Thu Mar 3 12:14:44 2016 -0300

    d/patches: Remove spork usage (ROM)
---
 debian/control                                   |  1 -
 debian/patches/0001-Do-not-require-bundler.patch | 25 +++++++++++++++++-------
 debian/patches/series                            |  1 -
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 97d8ab4..9cf51f6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9~),
                ruby-rspec,
                ruby-semverse (>= 1.1),
                ruby-dep-selector (>= 1.0.3-2),
-               spork
 Standards-Version: 3.9.6
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-solve.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-solve.git
diff --git a/debian/patches/0001-Do-not-require-bundler.patch b/debian/patches/0001-Do-not-require-bundler.patch
index dfcec66..745aad7 100644
--- a/debian/patches/0001-Do-not-require-bundler.patch
+++ b/debian/patches/0001-Do-not-require-bundler.patch
@@ -1,18 +1,29 @@
 From: Hleb Valoshka <375gnu at gmail.com>
 Date: Wed, 24 Jun 2015 19:22:47 +0300
-Subject: Do not require bundler
+Subject: Do not require bundler and remove spork
 
 ---
  spec/spec_helper.rb | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 5475958..6875cfe 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,5 +1,4 @@
+@@ -1,8 +1,6 @@
  require 'rubygems'
 -require 'bundler'
- require 'spork'
- 
- Spork.prefork do
+-require 'spork'
++require 'solve'
+
+-Spork.prefork do
+   require 'rspec'
+
+   APP_ROOT = File.expand_path('../../', __FILE__)
+@@ -18,8 +16,3 @@ Spork.prefork do
+     # Run specs in a random order
+     config.order = :random
+   end
+-end
+-
+-Spork.each_run do
+-  require 'solve'
+-end
diff --git a/debian/patches/series b/debian/patches/series
index 10c5e31..d043332 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Do-not-require-bundler.patch
-0003-Change-Version-to-Semverse-Version.patch

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