[DRE-commits] [ruby-raindrops] 03/06: 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-raindrops.

commit e2ca61e9097d61dc51d92e311dab199ef704c196
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Mon Aug 8 13:39:15 2016 +0300

    Refresh patches
---
 ....patch => 0001-Invoke-unix_listener_stats-conditionally.patch} | 4 ++--
 ...02-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch} | 8 ++++----
 debian/patches/series                                             | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0002-Invoke-unix_listener_stats-conditionally.patch b/debian/patches/0001-Invoke-unix_listener_stats-conditionally.patch
similarity index 90%
rename from debian/patches/0002-Invoke-unix_listener_stats-conditionally.patch
rename to debian/patches/0001-Invoke-unix_listener_stats-conditionally.patch
index e3dc63c..2382785 100644
--- a/debian/patches/0002-Invoke-unix_listener_stats-conditionally.patch
+++ b/debian/patches/0001-Invoke-unix_listener_stats-conditionally.patch
@@ -10,10 +10,10 @@ isn't allowed to access /proc.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/raindrops/watcher.rb b/lib/raindrops/watcher.rb
-index fb2df5b..0c7c425 100644
+index b0615f7..5e41709 100644
 --- a/lib/raindrops/watcher.rb
 +++ b/lib/raindrops/watcher.rb
-@@ -171,7 +171,7 @@ class Raindrops::Watcher
+@@ -171,7 +171,7 @@ def aggregator_thread(logger) # :nodoc:
      thr = Thread.new do
        begin
          combined = tcp_listener_stats(@tcp_listeners, sock)
diff --git a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch b/debian/patches/0002-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
similarity index 83%
rename from debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
rename to debian/patches/0002-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
index 528a6ec..6fc4466 100644
--- a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
+++ b/debian/patches/0002-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
@@ -9,10 +9,10 @@ Subject: Disable tests which require inet_diag or tcp_diag kernel modules
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/test/test_linux.rb b/test/test_linux.rb
-index 0e79a86..ec71681 100644
+index bfefcc4..6d0114e 100644
 --- a/test/test_linux.rb
 +++ b/test/test_linux.rb
-@@ -106,7 +106,7 @@ class TestLinux < Test::Unit::TestCase
+@@ -106,7 +106,7 @@ def test_unix_resolves_symlinks
      assert_equal 1, stats[tmp.path].queued
    end
  
@@ -21,7 +21,7 @@ index 0e79a86..ec71681 100644
      s = TCPServer.new(TEST_ADDR, 0)
      port = s.addr[1]
      addr = "#{TEST_ADDR}:#{port}"
-@@ -129,7 +129,7 @@ class TestLinux < Test::Unit::TestCase
+@@ -129,7 +129,7 @@ def test_tcp
      assert_equal 1, stats[addr].active
    end
  
@@ -30,7 +30,7 @@ index 0e79a86..ec71681 100644
      nlsock = Raindrops::InetDiagSocket.new
      s = TCPServer.new(TEST_ADDR, 0)
      port = s.addr[1]
-@@ -155,7 +155,7 @@ class TestLinux < Test::Unit::TestCase
+@@ -155,7 +155,7 @@ def test_tcp_reuse_sock
        nlsock.close
    end
  
diff --git a/debian/patches/series b/debian/patches/series
index 7afaa40..46d09f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0002-Invoke-unix_listener_stats-conditionally.patch
-0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
+0001-Invoke-unix_listener_stats-conditionally.patch
+0002-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch

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