[Python-modules-commits] [pyusb] 04/05: merge patched into master
Ruben Undheim
rubund-guest at moszumanska.debian.org
Sat Apr 16 09:36:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository pyusb.
commit 4d261f98100df48f74955b5b15ea87a21c16694d
Merge: 72a571c c135b01
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date: Sat Apr 16 11:28:26 2016 +0200
merge patched into master
README.rst | 2 +-
debian/.git-dpm | 4 +-
debian/patches/0001-Fix-braino-in-libusb0.patch | 23 +++++++++++
debian/patches/0002-Fixed-typo-in-README.patch | 23 +++++++++++
...003-Issue-133-Fixing-detach_kernel_driver.patch | 47 ++++++++++++++++++++++
debian/patches/series | 3 ++
usb/backend/libusb0.py | 15 ++++---
7 files changed, 109 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index cad903a,0000000..6895df6
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
- 844e7829e83af5abe01ddd609b8a04e66e0c5dc6
- 844e7829e83af5abe01ddd609b8a04e66e0c5dc6
++c135b017ad7aa7da749043a434a2cff9f367394e
++c135b017ad7aa7da749043a434a2cff9f367394e
+844e7829e83af5abe01ddd609b8a04e66e0c5dc6
+844e7829e83af5abe01ddd609b8a04e66e0c5dc6
+pyusb_1.0.0~rc1.orig.tar.gz
+1ca810cecfcaf3ff50bb3d2d65374509f1fe3511
+59403
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-braino-in-libusb0.patch
index 0000000,0000000..82b0aaa
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-braino-in-libusb0.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 9681f0ccb0f6029ab7b4d401f20b501ed88d11be Mon Sep 17 00:00:00 2001
++From: Wander Lairson Costa <wander.lairson at gmail.com>
++Date: Thu, 18 Feb 2016 21:30:18 -0200
++Subject: Fix braino in libusb0.
++
++Thanks to Ioan Lupu.
++---
++ usb/backend/libusb0.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/usb/backend/libusb0.py b/usb/backend/libusb0.py
++index e5a4b7c..319c228 100644
++--- a/usb/backend/libusb0.py
+++++ b/usb/backend/libusb0.py
++@@ -457,7 +457,7 @@ class _LibUSB(usb.backend.IBackend):
++ def get_interface_descriptor(self, dev, intf, alt, config):
++ cfgdesc = self.get_configuration_descriptor(dev, config)
++ if intf >= cfgdesc.bNumInterfaces:
++- raise IndexError('Invalid interface index ' + str(interface))
+++ raise IndexError('Invalid interface index ' + str(intf))
++ interface = cfgdesc.interface[intf]
++ if alt >= interface.num_altsetting:
++ raise IndexError('Invalid alternate setting index ' + str(alt))
diff --cc debian/patches/0002-Fixed-typo-in-README.patch
index 0000000,0000000..187ea08
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fixed-typo-in-README.patch
@@@ -1,0 -1,0 +1,23 @@@
++From e4d5924c7a8610a0cdfb7661345897d55ceddadc Mon Sep 17 00:00:00 2001
++From: Wander Lairson Costa <wander.lairson at gmail.com>
++Date: Thu, 18 Feb 2016 21:32:45 -0200
++Subject: Fixed typo in README.
++
++Thanks to Ioan Lupu.
++---
++ README.rst | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/README.rst b/README.rst
++index 6e2ba5a..efc1f87 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -78,7 +78,7 @@ give the complete path to the Python interpreter.
++
++ Remember that you need libusb (1.0 or 0.1) or OpenUSB running on your
++ system. For Windows users, libusb 0.1 is provided through
++-`libusb-win32 <http://libubs-win32.sourceforge.net>`_
+++`libusb-win32 <http://libusb-win32.sourceforge.net>`_
++ package. Check the libusb website for updates
++ (http://www.libusb.org).
++
diff --cc debian/patches/0003-Issue-133-Fixing-detach_kernel_driver.patch
index 0000000,0000000..637ccfe
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Issue-133-Fixing-detach_kernel_driver.patch
@@@ -1,0 -1,0 +1,47 @@@
++From c135b017ad7aa7da749043a434a2cff9f367394e Mon Sep 17 00:00:00 2001
++From: Robert Wlodarczyk <robert at simplicityguy.com>
++Date: Sat, 20 Feb 2016 18:15:16 -0800
++Subject: Issue #133: Fixing `detach_kernel_driver`.
++
++---
++ usb/backend/libusb0.py | 13 +++++++++----
++ 1 file changed, 9 insertions(+), 4 deletions(-)
++
++diff --git a/usb/backend/libusb0.py b/usb/backend/libusb0.py
++index 319c228..3f6d852 100644
++--- a/usb/backend/libusb0.py
+++++ b/usb/backend/libusb0.py
++@@ -361,6 +361,12 @@ def _setup_prototypes(lib):
++ # struct usb_bus *usb_get_busses(void);
++ lib.usb_get_busses.restype = POINTER(_usb_bus)
++
+++ # linux only
+++
+++ # int usb_detach_kernel_driver_np(usb_dev_handle *dev, int interface);
+++ if hasattr(lib, 'usb_detach_kernel_driver_np'):
+++ lib.usb_detach_kernel_driver_np.argtypes = [_usb_dev_handle, c_int]
+++
++ # libusb-win32 only
++
++ # int usb_isochronous_setup_async(usb_dev_handle *dev,
++@@ -487,10 +493,6 @@ class _LibUSB(usb.backend.IBackend):
++ _check(_lib.usb_set_configuration(dev_handle, config_value))
++
++ @methodtrace(_logger)
++- def set_interface_altsetting(self, dev_handle, intf, altsetting):
++- _check(_lib.usb_set_altinterface(dev_handle, altsetting))
++-
++- @methodtrace(_logger)
++ def get_configuration(self, dev_handle):
++ bmRequestType = usb.util.build_request_type(
++ usb.util.CTRL_IN,
++@@ -510,6 +512,9 @@ class _LibUSB(usb.backend.IBackend):
++ assert ret == 1
++ return buff[0]
++
+++ @methodtrace(_logger)
+++ def set_interface_altsetting(self, dev_handle, intf, altsetting):
+++ _check(_lib.usb_set_altinterface(dev_handle, altsetting))
++
++ @methodtrace(_logger)
++ def claim_interface(self, dev_handle, intf):
diff --cc debian/patches/series
index 0000000,0000000..9468539
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++0001-Fix-braino-in-libusb0.patch
++0002-Fixed-typo-in-README.patch
++0003-Issue-133-Fixing-detach_kernel_driver.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyusb.git
More information about the Python-modules-commits
mailing list