[DRE-commits] [ruby-buff-extensions] 02/05: Refresh 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-buff-extensions.

commit 15559a66272417002c9f1a29375080aeaf4adad3
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Sun Jul 23 20:25:30 2017 +0300

    Refresh patches
---
 .../patches/0001-Don-t-change-LOAD_PATH-in-tests.patch |  2 +-
 debian/patches/Ruby2.3-compat-hack.patch               | 17 -----------------
 debian/patches/remove-spork                            | 18 ++++++++++++++----
 debian/patches/series                                  |  1 -
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/debian/patches/0001-Don-t-change-LOAD_PATH-in-tests.patch b/debian/patches/0001-Don-t-change-LOAD_PATH-in-tests.patch
index 5156854..73c2f79 100644
--- a/debian/patches/0001-Don-t-change-LOAD_PATH-in-tests.patch
+++ b/debian/patches/0001-Don-t-change-LOAD_PATH-in-tests.patch
@@ -7,7 +7,7 @@ Subject: Don't change LOAD_PATH in tests
  1 file changed, 2 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index d3bdf17..288aa72 100644
+index 5df4f78..9c9a5a2 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -1,5 +1,3 @@
diff --git a/debian/patches/Ruby2.3-compat-hack.patch b/debian/patches/Ruby2.3-compat-hack.patch
deleted file mode 100644
index f1c1760..0000000
--- a/debian/patches/Ruby2.3-compat-hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Ruby 2.3 has added a Hash#dig method that is incompatible with the
-monkey-patched version this library provides. When you now load
-this library, the ruby builtin version goes away.
-I hope in a future version of this lib, this will no longer be
-necessary.
-
-diff --git a/lib/buff/extensions/hash/dotted_paths.rb b/lib/buff/extensions/hash/dotted_paths.rb
-index 239326c..89b6921 100644
---- a/lib/buff/extensions/hash/dotted_paths.rb
-+++ b/lib/buff/extensions/hash/dotted_paths.rb
-@@ -122,5 +123,6 @@ module Buff
- end
- 
- class Hash
-+  remove_method :dig
-   include Buff::Extensions::Hash::DottedPaths
- end
diff --git a/debian/patches/remove-spork b/debian/patches/remove-spork
index 873b323..e04e0de 100644
--- a/debian/patches/remove-spork
+++ b/debian/patches/remove-spork
@@ -1,8 +1,18 @@
-Index: ruby-buff-extensions/spec/spec_helper.rb
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Sun, 23 Jul 2017 20:24:36 +0300
+Subject: remove-spork
+
 ===================================================================
---- ruby-buff-extensions.orig/spec/spec_helper.rb
-+++ ruby-buff-extensions/spec/spec_helper.rb
-@@ -14,7 +14,7 @@ def setup_rspec
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 9c9a5a2..69f0558 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -13,7 +13,7 @@ def setup_rspec
    end
  end
  
diff --git a/debian/patches/series b/debian/patches/series
index 84a47a5..476d6c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Don-t-change-LOAD_PATH-in-tests.patch
-Ruby2.3-compat-hack.patch
 remove-spork

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