[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 3fd79b58ec769c9ecb49aa61b1527cbbde09f73b
Merge: 264b5a3 5a6230d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Dec 28 14:45:28 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 2e27edc,0000000..fa2d933
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
- f4239e8c0977e9b3b54cde2f0000d96365c70dc0
- f4239e8c0977e9b3b54cde2f0000d96365c70dc0
++5a6230d0f9378e4dc5d75b861f500799ebb5db57
++5a6230d0f9378e4dc5d75b861f500799ebb5db57
 +f4239e8c0977e9b3b54cde2f0000d96365c70dc0
 +f4239e8c0977e9b3b54cde2f0000d96365c70dc0
 +python-imageio_2.1.1+ds1.orig.tar.gz
 +f3ce8cb961ea8218a26ce97ab306c73f31037876
 +3278098
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-system-libraries.patch
index 0000000,0000000..701ac15
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-system-libraries.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 5a6230d0f9378e4dc5d75b861f500799ebb5db57 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Wed, 28 Dec 2016 14:45:12 +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