[DRE-commits] [ruby-elasticsearch] 02/02: Update to new upstream version 1.0.12

[Tim Potter]

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

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

commit 87f2365d6503a473730a985e0491b93a15765981
Author: Tim Potter <tpot at hp.com>
Date:   Wed Aug 12 13:42:25 2015 +1000

    Update to new upstream version 1.0.12
---
 debian/changelog                         |  6 ++++++
 debian/patches/disable-patron-test.patch | 17 ++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f25f47..3bb8e3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-elasticsearch (1.0.12-1) unstable; urgency=medium
+
+  * Update to upstream version 1.0.12
+
+ -- Tim Potter <tpot at hp.com>  Wed, 12 Aug 2015 11:28:29 +1000
+
 ruby-elasticsearch (1.0.5-2) unstable; urgency=medium
 
   * Remove build/test dependency on ruby-patron.  The ruby-patron
diff --git a/debian/patches/disable-patron-test.patch b/debian/patches/disable-patron-test.patch
index 54056bb..7def132 100644
--- a/debian/patches/disable-patron-test.patch
+++ b/debian/patches/disable-patron-test.patch
@@ -1,20 +1,11 @@
-Description: Remove semi-bogus build/test dependency on ruby-patron 
- The ruby-patron package is currently not in testing, and looks like
- it is no longer maintained.  This patch disables the build and test
- dependency on ruby-patron as it's an optional transport-layer plugin.
-Author: Tim Potter <tpot at hp.com>
-Last-Update: 2014-11-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 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
-@@ -193,15 +193,6 @@ class Elasticsearch::Transport::ClientTe
-
+@@ -249,14 +249,6 @@ class Elasticsearch::Transport::ClientTe
          assert_includes handlers, Faraday::Adapter::Typhoeus
        end
--
+ 
 -      should "detect the adapter" do
 -        require 'patron'; load 'patron.rb'
 -
@@ -22,7 +13,7 @@ Index: ruby-elasticsearch/elasticsearch-transport/test/unit/client_test.rb
 -        handlers = c.transport.connections.all.first.connection.builder.handlers
 -
 -        assert_includes handlers, Faraday::Adapter::Patron
--      end
+-      end unless JRUBY
      end
-
+ 
    end

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