[DRE-commits] [ruby-sshkit] 02/06: d/patches: Refresh patches according new upstream

[Sebastien Badia]

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

sbadia pushed a commit to branch master
in repository ruby-sshkit.

commit 3da5f2f906b556faa1589532ee4cecb5b0259d7d
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Apr 10 13:37:01 2017 +0200

    d/patches: Refresh patches according new upstream
---
 debian/changelog                                   |  6 ++++++
 debian/patches/001_disabled-rubygems-bundler.patch |  9 ++++----
 .../003_disabled-tests-that-require-turn.patch     | 25 +++++++++++-----------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6704d0e..dd6accd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-sshkit (1.13.1-1) UNRELEASED; urgency=medium
+
+  * d/patches: Refresh patches according new upstream
+
+ -- Sebastien Badia <seb at sebian.fr>  Mon, 10 Apr 2017 10:20:08 +0200
+
 ruby-sshkit (1.9.0-1) unstable; urgency=medium
 
   [ Cédric Boutillier ]
diff --git a/debian/patches/001_disabled-rubygems-bundler.patch b/debian/patches/001_disabled-rubygems-bundler.patch
index 1a221a3..252fe25 100644
--- a/debian/patches/001_disabled-rubygems-bundler.patch
+++ b/debian/patches/001_disabled-rubygems-bundler.patch
@@ -5,17 +5,16 @@ Author: Sebastien Badia <seb at sebian.fr>
 Forwarded: not-needed
 Last-Update: 2016-03-01
 
---- ruby-sshkit-1.9.0~rc1.orig/test/helper.rb
-+++ ruby-sshkit-1.9.0~rc1/test/helper.rb
-@@ -1,11 +1,7 @@
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,10 +1,7 @@
 -require 'rubygems'
 -require 'bundler/setup'
  require 'tempfile'
  require 'minitest/autorun'
  require 'minitest/reporters'
  require 'mocha/setup'
--require 'unindent'
 -require 'stringio'
  require 'json'
-
+ 
  $LOAD_PATH.unshift(File.dirname(__FILE__))
diff --git a/debian/patches/003_disabled-tests-that-require-turn.patch b/debian/patches/003_disabled-tests-that-require-turn.patch
index 42076ca..d1cd785 100644
--- a/debian/patches/003_disabled-tests-that-require-turn.patch
+++ b/debian/patches/003_disabled-tests-that-require-turn.patch
@@ -4,12 +4,12 @@ Author: Sebastien Badia <seb at sebian.fr>
 Forwarded: not-needed
 Last-Update: 2015-05-04
 
---- ruby-sshkit-1.8.0.orig/test/unit/formatters/test_pretty.rb
-+++ ruby-sshkit-1.8.0/test/unit/formatters/test_pretty.rb
+--- a/test/unit/formatters/test_pretty.rb
++++ b/test/unit/formatters/test_pretty.rb
 @@ -65,11 +65,6 @@ module SSHKit
        assert_log_output "  INFO some spaces\n"
      end
-
+ 
 -    def test_can_log_non_strings
 -      pretty.log(Pathname.new('/var/log/my.log'))
 -      assert_log_output "  INFO /var/log/my.log\n"
@@ -17,11 +17,11 @@ Last-Update: 2015-05-04
 -
      def test_command_lifecycle_logging_without_color
        simulate_command_lifecycle(pretty)
-
+ 
 @@ -84,13 +79,6 @@ module SSHKit
        assert_equal expected_log_lines, output.split("\n")
      end
-
+ 
 -    def test_unsupported_class
 -      raised_error = assert_raises RuntimeError do
 -        pretty << Pathname.new('/tmp')
@@ -32,13 +32,12 @@ Last-Update: 2015-05-04
      def test_does_not_log_message_when_verbosity_is_too_low
        SSHKit.config.output_verbosity = Logger::WARN
        pretty.info('Some info')
-
---- ruby-sshkit-1.8.0.orig/test/unit/formatters/test_simple_text.rb
-+++ ruby-sshkit-1.8.0/test/unit/formatters/test_simple_text.rb
+--- a/test/unit/formatters/test_simple_text.rb
++++ b/test/unit/formatters/test_simple_text.rb
 @@ -28,11 +28,6 @@ module SSHKit
        assert_log_output "some spaces\n"
      end
-
+ 
 -    def test_can_log_non_strings
 -      simple.log(Pathname.new('/var/log/my.log'))
 -      assert_log_output "/var/log/my.log\n"
@@ -50,7 +49,7 @@ Last-Update: 2015-05-04
 @@ -57,13 +52,6 @@ module SSHKit
        assert_equal expected_log_lines, output.split("\n")
      end
-
+ 
 -    def test_unsupported_class
 -      raised_error = assert_raises RuntimeError do
 -        simple << Pathname.new('/tmp')
@@ -61,12 +60,12 @@ Last-Update: 2015-05-04
      def test_does_not_log_when_verbosity_is_too_low
        SSHKit.config.output_verbosity = Logger::WARN
        simple.info('Some info')
---- ruby-sshkit-1.8.0.orig/test/unit/test_deprecation_logger.rb
-+++ ruby-sshkit-1.8.0/test/unit/test_deprecation_logger.rb
+--- a/test/unit/test_deprecation_logger.rb
++++ b/test/unit/test_deprecation_logger.rb
 @@ -12,17 +12,6 @@ module SSHKit
        @logger ||= DeprecationLogger.new(output)
      end
-
+ 
 -    def test_hides_duplicate_deprecation_warnings
 -      line_number = generate_warning
 -      generate_warning

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