[DRE-commits] [ruby-net-ssh] 03/03: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-net-ssh.

commit a5bf0c88d24ea50c4d5143a3d52ac1e87d5f15cf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Dec 24 00:03:37 2015 +0530

    refresh patches
---
 debian/changelog                             |  1 +
 debian/patches/drop-require-test-unit.patch  |  6 ++++--
 debian/patches/series                        |  1 -
 debian/patches/skip-test-broken-on-1.8.patch | 28 ----------------------------
 4 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ca37c2..623294d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ruby-net-ssh (1:3.0.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream major release.
+  * Remove patch: skip-test-broken-on-1.8.patch (we dropped ruby 1.8 already)
 
  -- Pirate Praveen <praveen at debian.org>  Wed, 23 Dec 2015 23:58:05 +0530
 
diff --git a/debian/patches/drop-require-test-unit.patch b/debian/patches/drop-require-test-unit.patch
index c6b0f58..5f1358d 100644
--- a/debian/patches/drop-require-test-unit.patch
+++ b/debian/patches/drop-require-test-unit.patch
@@ -4,8 +4,10 @@ Author: Lucas Nussbaum <lucas at debian.org>
 Origin: vendor
 Forwarded: not-needed
 Last-Update: 2015-05-06
---- a/test/common.rb
-+++ b/test/common.rb
+Index: ruby-net-ssh/test/common.rb
+===================================================================
+--- ruby-net-ssh.orig/test/common.rb
++++ ruby-net-ssh/test/common.rb
 @@ -1,5 +1,4 @@
  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 -gem "test-unit" # http://rubyforge.org/pipermail/test-unit-tracker/2009-July/000075.html
diff --git a/debian/patches/series b/debian/patches/series
index 1a7c621..c93c75f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-skip-test-broken-on-1.8.patch
 dont-test-cyphers-that-dont-have-fixtures
 drop-require-test-unit.patch
diff --git a/debian/patches/skip-test-broken-on-1.8.patch b/debian/patches/skip-test-broken-on-1.8.patch
deleted file mode 100644
index 5c46a61..0000000
--- a/debian/patches/skip-test-broken-on-1.8.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Skip test that is broken on Ruby 1.8
-Author: Antonio Terceiro <terceiro at debian.org>
-
----
-
---- a/test/test_known_hosts.rb
-+++ b/test/test_known_hosts.rb
-@@ -8,6 +8,6 @@ class TestKnownHosts < Test::Unit::TestC
-     keys = kh.keys_for("github.com")
-     assert_equal(1, keys.count)
-     assert_equal("ssh-rsa", keys[0].ssh_type)
--  end
-+  end if RUBY_VERSION > '1.9'
- 
--end
-\ No newline at end of file
-+end
---- a/test/test_buffer.rb
-+++ b/test/test_buffer.rb
-@@ -34,7 +34,7 @@ class TestBuffer < Test::Unit::TestCase
-   def test_from_should_measure_bytesize_of_utf_8_string_correctly
-     buffer = Net::SSH::Buffer.from(:string, "\u2603") # Snowman is 3 bytes
-     assert_equal "\0\0\0\3\u2603", buffer.to_s
--  end
-+  end if RUBY_VERSION > '1.9'
- 
-   def test_read_without_argument_should_read_to_end
-     buffer = new("hello world")

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