[DRE-commits] [ruby-elasticsearch] 03/03: Updated patches and changelog

[Macártur Carvalho]

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

macartur-guest pushed a commit to branch master
in repository ruby-elasticsearch.

commit 02dd2b2d5755778b8e4daad273fb28f33d5eb9fe
Author: Macártur Carvalho <macartur.sc at gmail.com>
Date:   Mon Aug 8 19:23:53 2016 -0300

    Updated patches and changelog
---
 debian/changelog                                 |  5 +++--
 debian/patches/disable-patron-test.patch         | 11 ++++++-----
 debian/patches/fixed_transport_client_base.patch | 16 ++++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f449be9..7ecb965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-ruby-elasticsearch (1.0.12-2) UNRELEASED; urgency=medium
+ruby-elasticsearch (2.0.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * Adding docs to libs: extensions,dsl and watcher
   * Fixed warning without description in patch
   * Fixed arguments hash with retry_on_status
   * Published libs: extensions, dsl and watcher
+  * Imported upstream version 2.0.0
 
- -- Macártur Sousa <macartur.sc at debain.com>  Mon, 01 Aug 2016 16:50:15 -0300
+ -- Macártur Carvalho <macartur.sc at gmail.com>  Mon, 01 Aug 2016 16:50:15 -0300
 
 ruby-elasticsearch (1.0.12-1) unstable; urgency=medium
 
diff --git a/debian/patches/disable-patron-test.patch b/debian/patches/disable-patron-test.patch
index 31d2c2e..ff51a64 100644
--- a/debian/patches/disable-patron-test.patch
+++ b/debian/patches/disable-patron-test.patch
@@ -5,12 +5,13 @@ Last Update: 2014-11-11
 
 Index: ruby-elasticsearch/elasticsearch-transport/test/unit/client_test.rb
 ===================================================================
---- ruby-elasticsearch.orig/elasticsearch-transport/test/unit/client_test.rb
-+++ ruby-elasticsearch/elasticsearch-transport/test/unit/client_test.rb
-@@ -249,14 +249,6 @@ class Elasticsearch::Transport::ClientTe
+--- ruby-elasticsearch.orig/elasticsearch-transport/test/unit/client_test.rb	2016-08-08 18:17:25.112124886 -0300
++++ ruby-elasticsearch/elasticsearch-transport/test/unit/client_test.rb	2016-08-08 18:19:32.712414008 -0300
+@@ -259,15 +259,6 @@
+ 
          assert_includes handlers, Faraday::Adapter::Typhoeus
        end
- 
+-
 -      should "detect the adapter" do
 -        require 'patron'; load 'patron.rb'
 -
@@ -21,4 +22,4 @@ Index: ruby-elasticsearch/elasticsearch-transport/test/unit/client_test.rb
 -      end unless JRUBY
      end
  
-   end
+     context "configuring Faraday" do
diff --git a/debian/patches/fixed_transport_client_base.patch b/debian/patches/fixed_transport_client_base.patch
index c1d9cdd..76d01c8 100644
--- a/debian/patches/fixed_transport_client_base.patch
+++ b/debian/patches/fixed_transport_client_base.patch
@@ -8,13 +8,13 @@ Last Update: 2016-08-01
 
 Index: ruby-elasticsearch/elasticsearch-transport/lib/elasticsearch/transport/client.rb
 ===================================================================
---- ruby-elasticsearch.orig/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-01 13:10:27.703856897 -0300
-+++ ruby-elasticsearch/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-01 13:34:42.912979294 -0300
-@@ -93,6 +93,7 @@
-         arguments[:reload_on_failure]  ||= false
-         arguments[:randomize_hosts]    ||= false
-         arguments[:transport_options]  ||= {}
-+        arguments[:retry_on_status]    ||= {}
+--- ruby-elasticsearch.orig/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-08 18:10:35.498058735 -0300
++++ ruby-elasticsearch/elasticsearch-transport/lib/elasticsearch/transport/client.rb	2016-08-08 18:12:18.389628453 -0300
+@@ -99,6 +99,7 @@
+         @arguments[:randomize_hosts]    ||= false
+         @arguments[:transport_options]  ||= {}
+         @arguments[:http]               ||= {}
++        @arguments[:retry_on_status]    ||= {}
  
-         arguments[:transport_options].update(:request => { :timeout => arguments[:request_timeout] } ) if arguments[:request_timeout]
+         @arguments[:transport_options].update(:request => { :timeout => @arguments[:request_timeout] } ) if @arguments[:request_timeout]
  

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