[python-imageio] 04/06: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-imageio.

commit 61b42f24db7e596c00812879f0bdf16867446f08
Merge: 64eb761 14e1bbd
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Dec 22 14:21:34 2016 +0000

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/0001-Use-system-libraries.patch | 22 ++++++++++++++++++++++
 debian/patches/series                          |  1 +
 imageio/core/findlib.py                        |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a870eec,0000000..53ca3e7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e2a7f291e991f2e92274e0a02f930729b0335a3d
- e2a7f291e991f2e92274e0a02f930729b0335a3d
++14e1bbd6b92e0bca54c4d64f2ac216c7c6ab6a82
++14e1bbd6b92e0bca54c4d64f2ac216c7c6ab6a82
 +e2a7f291e991f2e92274e0a02f930729b0335a3d
 +e2a7f291e991f2e92274e0a02f930729b0335a3d
 +python-imageio_2.1.0+ds1.orig.tar.gz
 +518acb9a440d8ecbc505dc8a3b2741e22da75832
 +3277602
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-system-libraries.patch
index 0000000,0000000..b7e7222
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-system-libraries.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 14e1bbd6b92e0bca54c4d64f2ac216c7c6ab6a82 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Thu, 22 Dec 2016 14:21:00 +0000
++Subject: Use system libraries
++
++---
++ imageio/core/findlib.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/imageio/core/findlib.py b/imageio/core/findlib.py
++index f039445..e3aada8 100644
++--- a/imageio/core/findlib.py
+++++ b/imageio/core/findlib.py
++@@ -15,7 +15,7 @@ import ctypes
++ LOCALDIR = os.path.abspath(os.path.dirname(__file__))
++ 
++ # Flag that can be patched / set to True to disable loading non-system libs
++-SYSTEM_LIBS_ONLY = False
+++SYSTEM_LIBS_ONLY = True
++ 
++ 
++ def looks_lib(fname):
diff --cc debian/patches/series
index 0000000,0000000..1edaff6
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-system-libraries.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-imageio.git