[DRE-commits] [SCM] ruby-net-ssh.git branch, master, updated. debian/1%2.5.2-2-14-g919d107

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 0b6bfa5033fdcd6b3b9701224af284399a6e53c4
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Jul 2 15:34:19 2013 +0200

    Drop fix-test-inheritance.patch: Tests are running as expected now

diff --git a/debian/changelog b/debian/changelog
index df4a24c..7fc9824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-net-ssh (1:2.6.7-1) UNRELEASED; urgency=low
   * debian/patches:
     - Drop disable-test1.patch: The test is passing with ruby-test-unit 2.5.5
     - Drop disable-config-tests.patch: The input config is now existing
+    - Drop fix-test-inheritance.patch: Tests are running as expected now
 
  -- Laurent Bigonville <bigon at debian.org>  Tue, 02 Jul 2013 14:15:24 +0200
 
diff --git a/debian/patches/fix-test-inheritance.patch b/debian/patches/fix-test-inheritance.patch
deleted file mode 100644
index b5e6698..0000000
--- a/debian/patches/fix-test-inheritance.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
-+++ b/test/transport/kex/test_diffie_hellman_group_exchange_sha256.rb
-@@ -1,5 +1,6 @@
- require 'common'
- require 'net/ssh/transport/kex/diffie_hellman_group_exchange_sha1'
-+require 'transport/kex/test_diffie_hellman_group_exchange_sha1'
- 
- module Transport; module Kex
- 
---- a/test/transport/kex/test_ecdh_sha2_nistp384.rb
-+++ b/test/transport/kex/test_ecdh_sha2_nistp384.rb
-@@ -1,4 +1,5 @@
- require 'openssl'
-+require 'transport/kex/test_ecdh_sha2_nistp256'
- 
- unless defined?(OpenSSL::PKey::EC)
-   puts "Skipping tests for ecdh-sha2-nistp384 key exchange"
---- a/test/transport/kex/test_ecdh_sha2_nistp521.rb
-+++ b/test/transport/kex/test_ecdh_sha2_nistp521.rb
-@@ -1,4 +1,5 @@
- require 'openssl'
-+require 'transport/kex/test_ecdh_sha2_nistp256'
- 
- unless defined?(OpenSSL::PKey::EC)
-   puts "Skipping tests for ecdh-sha2-nistp521 key exchange"
diff --git a/debian/patches/series b/debian/patches/series
index a3a906c..843ff73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 disable-rubygems-in-tests.patch
-fix-test-inheritance.patch
 skip-test-broken-on-1.8.patch

-- 
ruby-net-ssh.git