[DRE-commits] [ruby-listen] 11/17: refresh patches

[Daisuke Higuchi]

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

dai pushed a commit to branch master
in repository ruby-listen.

commit 9cbdae570df3bfaee3ecbaea6c01cff8455b3b1e
Author: HIGUCHI Daisuke (VDR dai) <dai at debian.org>
Date:   Sun Nov 26 23:42:04 2017 +0900

    refresh patches
---
 .../0001-Remove-OSX-specific-dependency.patch        | 20 ++++++++++----------
 debian/patches/0002-gemspec-skip-git-usage.patch     | 12 ++++++------
 .../patches/0003-fix-listener-test-in-ruby2_3.patch  | 20 --------------------
 debian/patches/series                                |  1 -
 4 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/debian/patches/0001-Remove-OSX-specific-dependency.patch b/debian/patches/0001-Remove-OSX-specific-dependency.patch
index 18fdb63..c482d88 100644
--- a/debian/patches/0001-Remove-OSX-specific-dependency.patch
+++ b/debian/patches/0001-Remove-OSX-specific-dependency.patch
@@ -6,15 +6,15 @@ Subject: Remove OSX-specific dependency
  listen.gemspec | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/listen.gemspec b/listen.gemspec
-index 1a0e943..032415a 100644
---- a/listen.gemspec
-+++ b/listen.gemspec
-@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
+Index: ruby-listen/listen.gemspec
+===================================================================
+--- ruby-listen.orig/listen.gemspec
++++ ruby-listen/listen.gemspec
+@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
+     abort "Install 'ruby_dep' gem before building this gem"
+   end
  
-   s.required_ruby_version = '>= 1.9.3'
+-  s.add_dependency 'rb-fsevent', '~> 0.9', '>= 0.9.4'
+   s.add_dependency 'rb-inotify', '~> 0.9', '>= 0.9.7'
  
--  s.add_dependency 'rb-fsevent', '>= 0.9.3'
-   s.add_dependency 'rb-inotify', '>= 0.9'
- 
-   s.add_development_dependency 'bundler', '>= 1.3.5'
+   # Used to show warnings at runtime
diff --git a/debian/patches/0002-gemspec-skip-git-usage.patch b/debian/patches/0002-gemspec-skip-git-usage.patch
index a96d34c..ac8a21f 100644
--- a/debian/patches/0002-gemspec-skip-git-usage.patch
+++ b/debian/patches/0002-gemspec-skip-git-usage.patch
@@ -6,16 +6,16 @@ Subject: gemspec: skip git usage
  listen.gemspec | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/listen.gemspec b/listen.gemspec
-index 032415a..51b4137 100644
---- a/listen.gemspec
-+++ b/listen.gemspec
+Index: ruby-listen/listen.gemspec
+===================================================================
+--- ruby-listen.orig/listen.gemspec
++++ ruby-listen/listen.gemspec
 @@ -14,9 +14,7 @@ Gem::Specification.new do |s|
    s.description = 'The Listen gem listens to file modifications and '\
      'notifies you about the changes. Works everywhere!'
  
--  s.files        = `git ls-files -z`.split("\x0").select do |f|
--    /^(?:bin|lib)\// =~ f
+-  s.files = `git ls-files -z`.split("\x0").select do |f|
+-    %r{^(?:bin|lib)\/} =~ f
 -  end + %w(CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md)
 +  s.files        = Dir.glob('{bin,lib}/**/*') + %w(CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md)
  
diff --git a/debian/patches/0003-fix-listener-test-in-ruby2_3.patch b/debian/patches/0003-fix-listener-test-in-ruby2_3.patch
deleted file mode 100644
index 0444613..0000000
--- a/debian/patches/0003-fix-listener-test-in-ruby2_3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix listener_spec test in ruby 2.3
-Author: Thiago Ribeiro <thiago at pencillabs.com>
-Applied-Upstream: https://github.com/guard/listen/pull/368
-Last-Update: 2016-03-03
---- a/spec/lib/listen/listener_spec.rb
-+++ b/spec/lib/listen/listener_spec.rb
-@@ -86,7 +86,12 @@
-     context 'with a block' do
-       let(:myblock) { instance_double(Proc) }
-       let(:block) { proc { myblock.call }  }
--      subject { described_class.new('dir1', &block) }
-+      subject do
-+        described_class.new('dir1') do |*args|
-+          myblock.call(*args)
-+        end
-+      end
-+
- 
-       it 'passes the block to the event processor' do
-         allow(Event::Config).to receive(:new) do |*_args, &some_block|
diff --git a/debian/patches/series b/debian/patches/series
index 919c4e3..5827be6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Remove-OSX-specific-dependency.patch
 0002-gemspec-skip-git-usage.patch
-0003-fix-listener-test-in-ruby2_3.patch

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