[DRE-commits] [SCM] ruby-raindrops.git branch, master, updated. upstream/0.8.0-11-gc45f236

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit c45f2366baadadd29af732d5a00449b04b087539
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Thu Mar 15 22:01:46 2012 +0300

    really remove old patches

diff --git a/debian/patches/fix-absent-on-buildd-rack-logger b/debian/patches/fix-absent-on-buildd-rack-logger
deleted file mode 100644
index 5c90911..0000000
--- a/debian/patches/fix-absent-on-buildd-rack-logger
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/raindrops/watcher.rb
-+++ b/lib/raindrops/watcher.rb
-@@ -178,7 +178,7 @@
-           @cond.broadcast
-         end
-       rescue => e
--        logger.error "#{e.class} #{e.inspect}"
-+        logger.error "#{e.class} #{e.inspect}" if logger
-       end while sleep(@delay) && @socket
-       sock.close
-     end
diff --git a/debian/patches/fix-test-for-ipv6 b/debian/patches/fix-test-for-ipv6
deleted file mode 100644
index dd87bb1..0000000
--- a/debian/patches/fix-test-for-ipv6
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr ruby-raindrops-0.8.0.orig/test/test_linux_ipv6.rb ruby-raindrops-0.8.0/test/test_linux_ipv6.rb
---- ruby-raindrops-0.8.0.orig/test/test_linux_ipv6.rb	2011-11-15 20:41:04.000000000 +0300
-+++ ruby-raindrops-0.8.0/test/test_linux_ipv6.rb	2011-11-15 21:13:45.630171292 +0300
-@@ -12,6 +12,14 @@
- 
-   TEST_ADDR = ENV["TEST_HOST6"] || "::1"
- 
-+  def setup
-+    @to_close = []
-+  end
-+
-+  def teardown
-+    @to_close.each { |io| io.close unless io.closed? }
-+  end
-+
-   def test_tcp
-     s = TCPServer.new(TEST_ADDR, 0)
-     port = s.addr[1]
diff --git a/debian/patches/fix-test-for-non-linux b/debian/patches/fix-test-for-non-linux
deleted file mode 100644
index 8750be9..0000000
--- a/debian/patches/fix-test-for-non-linux
+++ /dev/null
@@ -1,22 +0,0 @@
-From 499e63e2666f88134f7d47f3bcfdfedd72396e70 Mon Sep 17 00:00:00 2001
-From: Jeremy Evans <code at jeremyevans.net>
-Date: Mon, 14 Nov 2011 18:31:53 +0000
-Subject: Test suite fix for non-linux users
-
-Most other linux-specific test files have this, but
-test_linux_tcp_info.rb does not.
-
-With this patch, gmake test passes on OpenBSD.
----
-diff --git a/test/test_linux_tcp_info.rb b/test/test_linux_tcp_info.rb
-index f429d1d..3b4a245 100644
---- a/test/test_linux_tcp_info.rb
-+++ b/test/test_linux_tcp_info.rb
-@@ -58,4 +58,4 @@ class TestLinuxTCP_Info < Test::Unit::TestCase
-       a.close if a
-       s.close
-   end
--end
-+end if RUBY_PLATFORM =~ /linux/
---
-cgit v0.9.0.2-54-g2d9a

-- 
ruby-raindrops.git