[DRE-commits] [ruby-solve] 02/04: Drop no more required patches

[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 7f47e870536ad79e042f9d823a043f50b928486d
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Aug 8 14:19:36 2016 +0300

    Drop no more required patches
---
 ...02-Add-callback-required-by-Molinillo-0.4.patch | 27 ----------------------
 ...-Relax-dependency-on-molinillo-in-gemspec.patch | 21 -----------------
 debian/patches/series                              |  2 --
 3 files changed, 50 deletions(-)

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
deleted file mode 100644
index 38eeaa0..0000000
--- a/debian/patches/0002-Add-callback-required-by-Molinillo-0.4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Christian Hofstaedtler <zeha at debian.org>
-Date: Thu, 3 Mar 2016 19:10:48 +0100
-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.
----
- lib/solve/ruby_solver.rb | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lib/solve/ruby_solver.rb b/lib/solve/ruby_solver.rb
-index 08a1182..411d7ef 100644
---- a/lib/solve/ruby_solver.rb
-+++ b/lib/solve/ruby_solver.rb
-@@ -109,6 +109,12 @@ module Solve
-       @ui.say('Starting dependency resolution') if @ui
-     end
- 
-+    # Callback required by Molinillo, asks solver if a given dep can be ignored.
-+    # @return false
-+    def allow_missing?(dependency)
-+      false
-+    end
-+
-     # Callback required by Molinillo, called when the solve is complete.
-     # @return nil
-     def after_resolution
diff --git a/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch b/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch
deleted file mode 100644
index c394539..0000000
--- a/debian/patches/0003-Relax-dependency-on-molinillo-in-gemspec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 92f676c..8d3be28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 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