[DRE-commits] [ruby-elasticsearch] 01/01: Remove build/test dependency on ruby-patron

[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 e4f2500f949739c03b6a17c6da62f7399591e6f9
Author: Tim Potter <tpot at hp.com>
Date:   Tue Nov 11 10:28:08 2014 +1100

    Remove build/test dependency on ruby-patron
---
 debian/changelog                         |  7 +++++++
 debian/control                           |  1 -
 debian/patches/disable-patron-test.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 00f06be..2ae718a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-elasticsearch (1.0.5-2) unstable; urgency=medium
+
+  * Remove semi-bogus build/test dependency on ruby-patron.
+    (Closes: #768613)
+
+ -- Tim Potter <tpot at hp.com>  Tue, 11 Nov 2014 10:21:11 +1100
+
 ruby-elasticsearch (1.0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #760806)
diff --git a/debian/control b/debian/control
index 8ce8aa2..35ca998 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 9),
                ruby-jsonify,
                ruby-mocha,
                ruby-multi-json,
-               ruby-patron,
                ruby-shoulda-context,
                ruby-test-unit
 Standards-Version: 3.9.6
diff --git a/debian/patches/disable-patron-test.patch b/debian/patches/disable-patron-test.patch
new file mode 100644
index 0000000..54056bb
--- /dev/null
+++ b/debian/patches/disable-patron-test.patch
@@ -0,0 +1,28 @@
+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
+
+         assert_includes handlers, Faraday::Adapter::Typhoeus
+       end
+-
+-      should "detect the adapter" do
+-        require 'patron'; load 'patron.rb'
+-
+-        c = Elasticsearch::Transport::Client.new
+-        handlers = c.transport.connections.all.first.connection.builder.handlers
+-
+-        assert_includes handlers, Faraday::Adapter::Patron
+-      end
+     end
+
+   end
diff --git a/debian/patches/series b/debian/patches/series
index 9933a0d..b6c603d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 really-disable-ruby-prof.patch
+disable-patron-test.patch

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