[DRE-commits] [rerun] 03/12: remove patch applied upstream

Antonio Terceiro terceiro at moszumanska.debian.org
Mon May 9 01:18:55 UTC 2016


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

terceiro pushed a commit to branch master
in repository rerun.

commit edc5833d6686780cda3e90c63ca903e9b7f2f607
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Sun May 8 21:09:37 2016 -0300

    remove patch applied upstream
---
 debian/changelog                           |  1 +
 debian/patches/0002-Port-to-listen-3.patch | 69 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1c695a..4fa6139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rerun (0.11.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches/0002-Port-to-listen-3.patch: remove, applied upstream.
 
  -- Antonio Terceiro <terceiro at debian.org>  Wed, 16 Mar 2016 17:14:58 -0300
 
diff --git a/debian/patches/0002-Port-to-listen-3.patch b/debian/patches/0002-Port-to-listen-3.patch
deleted file mode 100644
index 8586ce2..0000000
--- a/debian/patches/0002-Port-to-listen-3.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Sat, 8 Aug 2015 11:06:39 -0300
-Subject: Port to listen 3
-
----
- lib/rerun/runner.rb  |  3 +--
- lib/rerun/watcher.rb | 11 ++---------
- rerun.gemspec        |  2 +-
- 3 files changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/lib/rerun/runner.rb b/lib/rerun/runner.rb
-index 6c61084..dcb041f 100644
---- a/lib/rerun/runner.rb
-+++ b/lib/rerun/runner.rb
-@@ -193,8 +193,7 @@ module Rerun
-         watcher.start
-         @watcher = watcher
-         say "Watching #{dir.join(', ')} for #{pattern}" +
--                (ignore.empty? ? "" : " (ignoring #{ignore.join(',')})") +
--                " using #{watcher.adapter.class.name.split('::').last} adapter"
-+                (ignore.empty? ? "" : " (ignoring #{ignore.join(',')})")
-       end
-     end
- 
-diff --git a/lib/rerun/watcher.rb b/lib/rerun/watcher.rb
-index 23a1ecd..402bcc6 100644
---- a/lib/rerun/watcher.rb
-+++ b/lib/rerun/watcher.rb
-@@ -85,13 +85,6 @@ module Rerun
-       [dotfiles] + @ignore.map { |x| Rerun::Glob.new(x).to_regexp }
-     end
- 
--    def adapter
--      @listener.registry[:adapter] || (timeout(4) do
--        sleep 1 until adapter = @listener.registry[:adapter]
--        adapter
--      end)
--    end
--
-     # kill the file watcher thread
-     def stop
-       @thread.wakeup rescue ThreadError
-@@ -115,11 +108,11 @@ module Rerun
-     end
- 
-     def unpause
--      @listener.unpause if @listener
-+      @listener.start if @listener
-     end
- 
-     def running?
--      @listener && @listener.instance_variable_get(:@adapter)
-+      @listener && @listener.processing?
-     end
- 
-   end
-diff --git a/rerun.gemspec b/rerun.gemspec
-index 0b84799..8f80d0c 100644
---- a/rerun.gemspec
-+++ b/rerun.gemspec
-@@ -25,7 +25,7 @@ $spec = Gem::Specification.new do |s|
- 
-   s.extra_rdoc_files = %w[README.md]
- 
--  s.add_runtime_dependency 'listen', '~> 2.7', '>= 2.7.3'
-+  s.add_runtime_dependency 'listen', '~> 3.0'
- 
-   s.homepage = "http://github.com/alexch/rerun/"
-   s.require_paths = %w[lib]
diff --git a/debian/patches/series b/debian/patches/series
index fad3e0a..3249890 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Read-version-number-from-installed-gemspec.patch
-0002-Port-to-listen-3.patch

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



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