[DRE-commits] [ruby-kgio] 03/04: Drop upstream applied patch and refresh the other

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository ruby-kgio.

commit 2e7302396ca787ac3e7d8fceb36542f8c94c5fa2
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Apr 9 17:20:59 2015 +0200

    Drop upstream applied patch and refresh the other
---
 debian/patches/fix-test                   | 16 ----------------
 debian/patches/fix-test-test_default_wait |  6 ++++--
 debian/patches/series                     |  1 -
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/debian/patches/fix-test b/debian/patches/fix-test
deleted file mode 100644
index 39734ee..0000000
--- a/debian/patches/fix-test
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch from Upstream, Eric Wrong <normalperson at yhbt.net>
-
-Index: ruby-kgio/test/lib_read_write.rb
-===================================================================
---- ruby-kgio.orig/test/lib_read_write.rb	2014-04-09 22:16:28.317721512 +0200
-+++ ruby-kgio/test/lib_read_write.rb	2014-04-09 22:16:37.845700891 +0200
-@@ -292,7 +292,8 @@ module LibReadWriteTest
-     assert_equal :wait_writable, tmp.pop
-     assert tmp.size > 0
-     penultimate = tmp.pop
--    assert(penultimate == "I" || penultimate == nil)
-+    assert(penultimate == ["I"] || penultimate == nil,
-+           "penultimate is #{penultimate.inspect}")
-     assert tmp.size > 0
-     tmp.each { |count| assert_equal nil, count }
-   end
diff --git a/debian/patches/fix-test-test_default_wait b/debian/patches/fix-test-test_default_wait
index 63c7bf3..e03568d 100644
--- a/debian/patches/fix-test-test_default_wait
+++ b/debian/patches/fix-test-test_default_wait
@@ -10,8 +10,10 @@ Description: fix test to take account of larger page sizes on ppc64el
 Author: Andy Whitcroft <apw at canonical.com>
 Last-Update: 2014-04-29
 
---- ruby-kgio-2.9.2.orig/test/test_default_wait.rb
-+++ ruby-kgio-2.9.2/test/test_default_wait.rb
+Index: ruby-kgio/test/test_default_wait.rb
+===================================================================
+--- ruby-kgio.orig/test/test_default_wait.rb
++++ ruby-kgio/test/test_default_wait.rb
 @@ -39,7 +39,11 @@ class TestDefaultWait < Test::Unit::Test
      diff = Time.now - t0
      assert_in_delta diff, 1.1, 0.2
diff --git a/debian/patches/series b/debian/patches/series
index a0da2b0..04704ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-test
 fix-test-test_default_wait

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