[DRE-commits] [ruby-ffi-rzmq] 03/03: load .so from libzmq3 or libzmq1 packages

[Dmitry Borodaenko]

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

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

commit f4f7cf693542f957c27d2664403fe9eb7b030f1c
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date:   Sun Sep 1 19:05:29 2013 -0700

    load .so from libzmq3 or libzmq1 packages
---
 debian/control                                     |    2 +-
 .../0001-load-so-from-libzmq3-or-libzmq1.patch     |   21 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 70c03d8..7c7bfdf 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ XS-Ruby-Versions: ruby1.9.1
 Package: ruby-ffi-rzmq
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-ffi, libzmq3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-ffi, libzmq3 | libzmq1
 Description: FFI based Ruby bindings for ZeroMQ (ØMQ) networking library
  ØMQ is a library which extends the standard socket interfaces with features
  traditionally provided by specialised messaging middleware products.
diff --git a/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch b/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
new file mode 100644
index 0000000..28df0b9
--- /dev/null
+++ b/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
@@ -0,0 +1,21 @@
+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 dc188ae..c975958 100644
+--- a/lib/ffi-rzmq/libzmq.rb
++++ b/lib/ffi-rzmq/libzmq.rb
+@@ -18,7 +18,7 @@ module ZMQ
+       ZMQ_LIB_PATHS = [
+         inside_gem, '/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
+       if ZMQ_LIB_PATHS.push(*local_path).any? {|path|
+         File.file? File.join(path, "libzmq.#{FFI::Platform::LIBSUFFIX}")}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1c38c4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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