[DRE-commits] [ruby-ffi-rzmq] 02/02: new upstream version 1.0.3

[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 4c94f0382d0f80dcd0a08abc5ce2db9c57349c9d
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date:   Sun Oct 6 01:09:58 2013 -0700

    new upstream version 1.0.3
---
 debian/changelog                                       |    6 ++++++
 .../patches/0001-load-so-from-libzmq3-or-libzmq1.patch |   16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72c3111..ae3c633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-ffi-rzmq (1.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 06 Oct 2013 01:05:25 -0700
+
 ruby-ffi-rzmq (1.0.1-2) unstable; urgency=low
 
   * debian/copyright updated to include LGPL-3+ for the latency measurement
diff --git a/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch b/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
index 28df0b9..b5d2fb1 100644
--- a/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
+++ b/debian/patches/0001-load-so-from-libzmq3-or-libzmq1.patch
@@ -7,15 +7,15 @@ Subject: load so from libzmq3 or libzmq1
  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
+index 07bf6ad..69071fe 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}"}
+@@ -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
-       if ZMQ_LIB_PATHS.push(*local_path).any? {|path|
-         File.file? File.join(path, "libzmq.#{FFI::Platform::LIBSUFFIX}")}
+     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."

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