diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-01 14:02:47 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-01 14:02:47 +0200 |
commit | ebf181ce25f98bfdd5a6beb0327f7cfa10a39ac6 (patch) | |
tree | 30b4b81d186a06b64cd1ffb51236ec52a8e47e34 /debian/patches/03_kfreebsd.diff | |
parent | 22f703cab05b7cd368f4de9e03991b7664dc5022 (diff) | |
parent | d7f89e6fe63b8697fab5a901cfce457b375638b3 (diff) |
Merge tag 'upstream/1.5.1'
Upstream version 1.5.1
Diffstat (limited to 'debian/patches/03_kfreebsd.diff')
-rw-r--r-- | debian/patches/03_kfreebsd.diff | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/debian/patches/03_kfreebsd.diff b/debian/patches/03_kfreebsd.diff deleted file mode 100644 index bbe7e5d..0000000 --- a/debian/patches/03_kfreebsd.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- a/spectro/usbio.c -+++ b/spectro/usbio.c -@@ -203,10 +203,6 @@ struct _icoms *p - #ifdef ENABLE_USB - struct usb_bus *bus; - -- /* Check that we've got an up to date version of libusb */ -- if (usb_argyll_patched() < 2) -- error("usblib isn't up to date to work with this version of Argyll"); -- - if (p->debug > 8) - usb_set_debug(p->debug); - -@@ -738,7 +734,7 @@ char **pnames /* List of process names - if (libusb_get_device_descriptor(p->ppath->dev, &descriptor) != LIBUSB_SUCCESS) - error("Get device descriptor on USB port '%s' failed with %d (%s)",p->ppath->path,rv,libusb_strerror(rv)); - #else -- descriptor = dev->descriptor; /* Copy */ -+ descriptor = p->ppath->dev->descriptor; /* Copy */ - #endif - - p->vid = p->ppath->vid; |