[DRE-commits] [ruby-listen] 04/12: remove all patches; none of them applies anymore

Antonio Terceiro terceiro at moszumanska.debian.org
Sat Aug 8 13:00:53 UTC 2015


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

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

commit ec6ea3253534d4e9070eee1c655d540c7a20203d
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 7 17:52:33 2015 -0300

    remove all patches; none of them applies anymore
---
 debian/patches/circumvent-dependency-manager       | 17 -------
 .../patches/deactivate_arch_specific_tests.patch   | 42 ---------------
 debian/patches/do_not_fail_fast.patch              | 16 ------
 debian/patches/mark_unstable_test_pending          | 29 -----------
 .../patches/remove-mcosx-specific-dependency.patch | 40 ---------------
 debian/patches/retry_three_times.patch             | 20 --------
 debian/patches/series                              |  7 ---
 debian/patches/skip_dependency_manager_test        | 59 ----------------------
 8 files changed, 230 deletions(-)

diff --git a/debian/patches/circumvent-dependency-manager b/debian/patches/circumvent-dependency-manager
deleted file mode 100644
index 383e983..0000000
--- a/debian/patches/circumvent-dependency-manager
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: replace a call to the dependency manager by a basic 'require'
- The dependency should already be installed. No need for further checks
-Author: Srihari K <srih4ri at gmail.com>
-Last-Update: 2012-11-04
-
---- a/lib/listen/adapters/linux.rb
-+++ b/lib/listen/adapters/linux.rb
-@@ -7,7 +7,8 @@ module Listen
-       extend DependencyManager
- 
-       # Declare the adapter's dependencies
--      dependency 'rb-inotify', '~> 0.8.8'
-+      #dependency 'rb-inotify', '~> 0.8.8'
-+      require 'rb-inotify' 
- 
-       # Watched inotify events
-       #
diff --git a/debian/patches/deactivate_arch_specific_tests.patch b/debian/patches/deactivate_arch_specific_tests.patch
deleted file mode 100644
index 1ff2f21..0000000
--- a/debian/patches/deactivate_arch_specific_tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: deactivate arch specific specs on non linux arches
- some tests require arch-specific backends (rb-inotify on Linux,
- rb-kqueue on BSD). They need to be deactivated at least as long as all
- arch-specific backends are packaged (and if they are arch-all). 
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-01-26
-
---- a/spec/lib/listen/adapter/bsd_spec.rb
-+++ b/spec/lib/listen/adapter/bsd_spec.rb
-@@ -11,7 +11,7 @@
-         expect(described_class).to be_usable
-       end
- 
--      it 'requires rb-kqueue and find gem' do
-+      xit 'requires rb-kqueue and find gem' do
-         described_class.usable?
-         expect(defined?(KQueue)).to be_true
-         expect(defined?(Find)).to be_true
---- a/spec/acceptance/listen_spec.rb
-+++ b/spec/acceptance/listen_spec.rb
-@@ -22,14 +22,18 @@
-     context "with change block raising" do
-       let(:callback) { ->(x,y,z) { raise 'foo' } }
- 
--      it "warns the backtrace" do
-+      xit "warns the backtrace" do
-         expect(Kernel).to receive(:warn).with("[Listen warning]: Change block raised an exception: foo")
-         expect(Kernel).to receive(:warn).with(/^Backtrace:.*/)
-         listen { touch 'file.rb' }
-       end
-     end
- 
--    [false, true].each do |polling|
-+    if RbConfig::CONFIG['target_os'] =~ /linux/i
-+      [false, true]
-+    else
-+      [true]
-+    end.each do |polling|
-       context "force_polling option to #{polling}" do
-         let(:options) { { force_polling: polling, latency: 0.1 } }
- 
diff --git a/debian/patches/do_not_fail_fast.patch b/debian/patches/do_not_fail_fast.patch
deleted file mode 100644
index b7e1e76..0000000
--- a/debian/patches/do_not_fail_fast.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: run the test suite until the end
- even in cases there are some failures
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-26
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -16,7 +16,7 @@
-   config.filter_run focus: true
-   config.treat_symbols_as_metadata_keys_with_true_values = true
-   config.run_all_when_everything_filtered = true
--  config.fail_fast = !ci?
-+#  config.fail_fast = !ci?
-   config.expect_with :rspec do |c|
-     c.syntax = :expect
-   end
diff --git a/debian/patches/mark_unstable_test_pending b/debian/patches/mark_unstable_test_pending
deleted file mode 100644
index 87fbc16..0000000
--- a/debian/patches/mark_unstable_test_pending
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: deactivate tests that are randomly failing
- These tests require that some operations occur during the same second, which
- cannot be garanteed.
-Bug: https://github.com/guard/listen/issues/55#issuecomment-7238619
-Author: Srihari K <srih4ri at gmail.com>
-Last-Update: 2013-10-17
-
---- a/spec/listen/directory_record_spec.rb
-+++ b/spec/listen/directory_record_spec.rb
-@@ -436,6 +436,9 @@
-           end
- 
-           it "doesn't detects the modified file the second time if the content haven't changed" do
-+
-+            pending 'See https://github.com/guard/listen/issues/55#issuecomment-7238619'
-+
-             fixtures do |path|
-               touch 'existing_file.txt'
- 
-@@ -478,6 +481,9 @@
- 
-           it "doesn't detects the modified file the second time if just touched - #62" do
-             fixtures do |path|
-+
-+              pending 'See https://github.com/guard/listen/issues/55#issuecomment-7238619'
-+
-               touch 'existing_file.txt'
-               # Set sha1 path checksum
-               changes(path) do
diff --git a/debian/patches/remove-mcosx-specific-dependency.patch b/debian/patches/remove-mcosx-specific-dependency.patch
deleted file mode 100644
index ac21521..0000000
--- a/debian/patches/remove-mcosx-specific-dependency.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: remove MacOSX-specific dependency
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2014-01-10
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/listen.gemspec
-+++ b/listen.gemspec
-@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
-   s.required_ruby_version = ">= 1.9.3"
- 
-   s.add_dependency 'celluloid',  '>= 0.15.2'
--  s.add_dependency 'rb-fsevent', '>= 0.9.3'
-   s.add_dependency 'rb-inotify', '>= 0.9'
- 
-   s.add_development_dependency 'bundler', '>= 1.3.5'
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -25,20 +25,6 @@ dependencies:
-       - !ruby/object:Gem::Version
-         version: 0.15.2
- - !ruby/object:Gem::Dependency
--  name: rb-fsevent
--  requirement: !ruby/object:Gem::Requirement
--    requirements:
--    - - '>='
--      - !ruby/object:Gem::Version
--        version: 0.9.3
--  type: :runtime
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    requirements:
--    - - '>='
--      - !ruby/object:Gem::Version
--        version: 0.9.3
--- !ruby/object:Gem::Dependency
-   name: rb-inotify
-   requirement: !ruby/object:Gem::Requirement
-     requirements:
diff --git a/debian/patches/retry_three_times.patch b/debian/patches/retry_three_times.patch
deleted file mode 100644
index 61ef969..0000000
--- a/debian/patches/retry_three_times.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: retry at most three times in case of test failure
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-01-24
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'listen'
- 
- def ci?; ENV['CI'] end
-@@ -25,7 +24,7 @@
- 
- require 'rspec/retry'
- RSpec.configure do |config|
--  config.default_retry_count = ci? ? 3 : 1
-+  config.default_retry_count = 3
- end
- 
- require 'celluloid/rspec'
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 24954d1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-#skip_dependency_manager_test
-#mark_unstable_test_pending
-#circumvent-dependency-manager
-retry_three_times.patch
-deactivate_arch_specific_tests.patch
-do_not_fail_fast.patch
-remove-mcosx-specific-dependency.patch
diff --git a/debian/patches/skip_dependency_manager_test b/debian/patches/skip_dependency_manager_test
deleted file mode 100644
index 12cbd60..0000000
--- a/debian/patches/skip_dependency_manager_test
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Skip tests of the dependency manager
- The dependency manager is disabled in Debian, since all the dependencies are
- handled by APT.
-Author: Srihari K <srih4ri at gmail.com>
-Last-Update: 2013-10-17
-
---- a/spec/listen/dependency_manager_spec.rb
-+++ b/spec/listen/dependency_manager_spec.rb
-@@ -45,9 +45,10 @@
-     before { subject.dependency 'listen', '~> 0.0.1' }
- 
-     context 'when dependencies can be loaded' do
--      before { subject.stub(:gem, :require) }
-+      #before { subject.stub(:gem, :require) }
- 
-       it 'loads all the registerd dependencies' do
-+        pending 'Dependency manager not used for Debian'
-         subject.load_depenencies
-         subject.dependencies_loaded?.should be_true
-       end
-@@ -55,15 +56,16 @@
- 
-     context 'when dependencies can not be loaded' do
-       it 'raises an error' do
-+        pending 'Dependency manager not used for Debian'
-         expect {
-           subject.load_depenencies
-         }.to raise_error(described_class::Error)
-       end
- 
-       context 'when running under bundler' do
--        before { subject.should_receive(:running_under_bundler?).and_return(true) }
--
-+        # before { subject.should_receive(:running_under_bundler?).and_return(true) }
-         it 'includes the Gemfile declaration to satisfy the dependency' do
-+          pending 'Dependency manager not used for Debian'
-           begin
-             subject.load_depenencies
-           rescue described_class::Error => e
-@@ -73,9 +75,10 @@
-       end
- 
-       context 'when not running under bundler' do
--        before { subject.should_receive(:running_under_bundler?).and_return(false) }
-+        # before { subject.should_receive(:running_under_bundler?).and_return(false) }
- 
-         it 'includes the command to install the dependency' do
-+          pending 'Dependency manager not used for Debian'
-           begin
-             subject.load_depenencies
-           rescue described_class::Error => e
-@@ -93,6 +96,7 @@
-     end
- 
-     it 'return true when dependencies are loaded' do
-+      pending 'Dependency manager not used for Debian'
-       subject.stub(:gem, :require)
- 
-       subject.dependency 'listen', '~> 0.0.1'

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



More information about the Pkg-ruby-extras-commits mailing list