[Python-modules-commits] [pyudev] 06/10: merge patched into master

[Felix Geyer]

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

fgeyer pushed a commit to branch master
in repository pyudev.

commit 06ed18d0a6936ff7eb006462021098dd3bb4f5ae
Merge: 44148e7 4079499
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Sep 9 22:29:47 2016 +0200

    merge patched into master

 debian/.git-dpm                     | 4 ++--
 debian/patches/libudev_loading.diff | 6 +++---
 src/pyudev/_ctypeslib/utils.py      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index fc2dd42,0000000..38fc182
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
- fbaba6ec50aa882f960eea324a6d842afe38b8bd
- fbaba6ec50aa882f960eea324a6d842afe38b8bd
++407949994bcd8f827a0963592018a65c9cc8a9e4
++407949994bcd8f827a0963592018a65c9cc8a9e4
 +ae5c381863dec12ad8f7df18f337dd8b06eaf6a2
 +ae5c381863dec12ad8f7df18f337dd8b06eaf6a2
 +pyudev_0.21.0.orig.tar.gz
 +58263b4358951d3a990bce7661e2e2ff30ca6cbe
 +89469
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/libudev_loading.diff
index 3b4b43c,0000000..4b3924f
mode 100644,000000..100644
--- a/debian/patches/libudev_loading.diff
+++ b/debian/patches/libudev_loading.diff
@@@ -1,43 -1,0 +1,43 @@@
- From fbaba6ec50aa882f960eea324a6d842afe38b8bd Mon Sep 17 00:00:00 2001
++From 407949994bcd8f827a0963592018a65c9cc8a9e4 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 13:29:41 -0700
 +Subject: Hardcode the libudev SONAME that the package depends on.
 +
 + This makes sure that we don't load an untested ABI.
 +Bu-Debian: https://bugs.debian.org/722573
 +
 +Patch-Name: libudev_loading.diff
 +---
 + src/pyudev/_ctypeslib/utils.py | 5 ++++-
 + src/pyudev/core.py             | 2 +-
 + 2 files changed, 5 insertions(+), 2 deletions(-)
 +
 +diff --git a/src/pyudev/_ctypeslib/utils.py b/src/pyudev/_ctypeslib/utils.py
- index d10b6c9..6efd18e 100644
++index d10b6c9..ac0dcb6 100644
 +--- a/src/pyudev/_ctypeslib/utils.py
 ++++ b/src/pyudev/_ctypeslib/utils.py
 +@@ -51,7 +51,10 @@ def load_ctypes_library(name, signatures, error_checkers):
 +     :rtype: ctypes.CDLL
 +     :raises ImportError: if the library is not found
 +     """
 +-    library_name = find_library(name)
- +    if if ".so" in name:
+++    if ".so" in name:
 ++        library_name = name
 ++    else:
 ++        library_name = find_library(name)
 +     if not library_name:
 +         raise ImportError('No library named %s' % name)
 +     lib = CDLL(library_name, use_errno=True)
 +diff --git a/src/pyudev/core.py b/src/pyudev/core.py
 +index de6f245..0e44ca2 100644
 +--- a/src/pyudev/core.py
 ++++ b/src/pyudev/core.py
 +@@ -61,7 +61,7 @@ class Context(object):
 +         """
 +         Create a new context.
 +         """
 +-        self._libudev = load_ctypes_library('udev', SIGNATURES, ERROR_CHECKERS)
 ++        self._libudev = load_ctypes_library('libudev.so.1', SIGNATURES, ERROR_CHECKERS)
 +         self._as_parameter_ = self._libudev.udev_new()
 + 
 +     def __del__(self):

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