[DRE-commits] [ruby-ffi-rzmq] 04/04: drop patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-ffi-rzmq.

commit 166f0faa5a096a4dae68d18fb567f3502b730086
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Mar 31 17:51:02 2014 +0200

    drop patches
---
 debian/changelog                                    |  1 +
 .../0001-load-so-from-libzmq3-or-libzmq1.patch      | 21 ---------------------
 debian/patches/series                               |  1 -
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db4749a..5eb3669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ruby-ffi-rzmq (2.0.1-1) UNRELEASED; urgency=medium
   * Imported Upstream version 2.0.1
     + support for libzmq3 ( >= 4.0) (Closes: #742190)
   * Drop alternative dependency with libzmq1 (Closes: #740420)
+  * Drop patches (now applied to ruby-ffi-rzmq-core)
 
  -- Cédric Boutillier <boutil at debian.org>  Thu, 20 Mar 2014 14:44:29 +0100
 
diff --git a/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch b/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
deleted file mode 100644
index b5d2fb1..0000000
--- a/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dmitry Borodaenko <angdraug at gmail.com>
-Date: Sun, 1 Sep 2013 19:03:52 -0700
-Subject: load so from libzmq3 or libzmq1
-
----
- lib/ffi-rzmq/libzmq.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/ffi-rzmq/libzmq.rb b/lib/ffi-rzmq/libzmq.rb
-index 07bf6ad..69071fe 100644
---- a/lib/ffi-rzmq/libzmq.rb
-+++ b/lib/ffi-rzmq/libzmq.rb
-@@ -16,7 +16,7 @@ module ZMQ
-       ZMQ_LIB_PATHS =([inside_gem] + local_path + [
-         '/usr/local/lib', '/opt/local/lib', '/usr/local/homebrew/lib', '/usr/lib64'
-       ]).map{|path| "#{path}/libzmq.#{FFI::Platform::LIBSUFFIX}"}
--      ffi_lib(ZMQ_LIB_PATHS + %w{libzmq})
-+      ffi_lib(%w{libzmq.so.3 libzmq.so.1} + ZMQ_LIB_PATHS + %w{libzmq})
-     rescue LoadError => e
-       if ZMQ_LIB_PATHS.any? {|path| File.file?(path) } 
-         warn "Unable to load this gem. The libzmq library exists, but cannot be loaded."
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e1c38c4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-load-so-from-libzmq3-or-libzmq1.patch

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