[DRE-commits] [ruby-solve] 06/07: Add patch to relax dependency on molinillo in gemspec

[Hleb Valoshka]

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

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

commit 04c704406530a36299e089fde6b3c951628e3b71
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Fri Aug 5 18:42:10 2016 +0300

    Add patch to relax dependency on molinillo in gemspec
---
 ...1-Do-not-require-bundler-and-remove-spork.patch} | 10 ++++++----
 ...002-Add-callback-required-by-Molinillo-0.4.patch |  8 ++------
 ...3-Relax-dependency-on-molinillo-in-gemspec.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  3 ++-
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Do-not-require-bundler.patch b/debian/patches/0001-Do-not-require-bundler-and-remove-spork.patch
similarity index 75%
rename from debian/patches/0001-Do-not-require-bundler.patch
rename to debian/patches/0001-Do-not-require-bundler-and-remove-spork.patch
index 745aad7..4ef6130 100644
--- a/debian/patches/0001-Do-not-require-bundler.patch
+++ b/debian/patches/0001-Do-not-require-bundler-and-remove-spork.patch
@@ -3,9 +3,11 @@ Date: Wed, 24 Jun 2015 19:22:47 +0300
 Subject: Do not require bundler and remove spork
 
 ---
- spec/spec_helper.rb | 1 -
- 1 file changed, 1 deletion(-)
+ spec/spec_helper.rb | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
 
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 5475958..fada3b1 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -1,8 +1,6 @@
@@ -13,10 +15,10 @@ Subject: Do not require bundler and remove spork
 -require 'bundler'
 -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
diff --git a/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch b/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
index af3326c..38eeaa0 100644
--- a/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
+++ b/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
@@ -1,7 +1,6 @@
-From f59ae43c62a30ba7b4bc6131bf3cfa638978ea75 Mon Sep 17 00:00:00 2001
 From: Christian Hofstaedtler <zeha at debian.org>
 Date: Thu, 3 Mar 2016 19:10:48 +0100
-Subject: [PATCH] Add callback required by Molinillo 0.4
+Subject: Add callback required by Molinillo 0.4
 
 allow_missing? is a new callback expected by molinillo. We'll just
 return false all the time, as that's the previous behaviour.
@@ -10,7 +9,7 @@ return false all the time, as that's the previous behaviour.
  1 file changed, 6 insertions(+)
 
 diff --git a/lib/solve/ruby_solver.rb b/lib/solve/ruby_solver.rb
-index 4bf244e..1882c51 100644
+index 08a1182..411d7ef 100644
 --- a/lib/solve/ruby_solver.rb
 +++ b/lib/solve/ruby_solver.rb
 @@ -109,6 +109,12 @@ module Solve
@@ -26,6 +25,3 @@ index 4bf244e..1882c51 100644
      # Callback required by Molinillo, called when the solve is complete.
      # @return nil
      def after_resolution
--- 
-2.7.0
-
diff --git a/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch b/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch
new file mode 100644
index 0000000..c394539
--- /dev/null
+++ b/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch
@@ -0,0 +1,21 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Fri, 5 Aug 2016 18:41:24 +0300
+Subject: Relax dependency on molinillo in gemspec
+
+---
+ solve.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/solve.gemspec b/solve.gemspec
+index 6c71e1a..b85b2f5 100644
+--- a/solve.gemspec
++++ b/solve.gemspec
+@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
+   s.required_ruby_version = ">= 2.1.0"
+ 
+   s.add_dependency "semverse",     "~> 1.1"
+-  s.add_dependency "molinillo",    "~> 0.4.2"
++  s.add_dependency "molinillo",    ">= 0.4.2"
+ 
+   s.add_development_dependency 'thor', '>= 0.16.0'
+   s.add_development_dependency 'rake', '>= 0.9.2.2'
diff --git a/debian/patches/series b/debian/patches/series
index 9be9311..92f676c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-0001-Do-not-require-bundler.patch
+0001-Do-not-require-bundler-and-remove-spork.patch
 0002-Add-callback-required-by-Molinillo-0.4.patch
+0003-Relax-dependency-on-molinillo-in-gemspec.patch

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