Hi,
libusb_2:0.1.12-5 is in unstable for 17 days now, without any bug. The
differences (see the diff below) with version 2:0.1.12-3 in Etch are not
really big, so I think it could be nice to unblock it, mainly for the
ANSI fix.
But this is not really a strong request, the package is already in good
shape in Etch and I would understand that you prefer not to unblock it
only for small things.
Thanks,
Aurelien
diff -u libusb-0.1.12/debian/control libusb-0.1.12/debian/control
--- libusb-0.1.12/debian/control
+++ libusb-0.1.12/debian/control
@@ -3,14 +3,13 @@
Priority: optional
Maintainer: Aurelien Jarno <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5.0.22), autotools-dev, pkg-config,
docbook-dsssl, jade | openjade
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: libusb-0.1-4
Priority: important
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: hotplug
Conflicts: libusb0, libccid (<< 0.9.2-3)
Replaces: libusb0
Description: userspace USB programming library
diff -u libusb-0.1.12/debian/changelog libusb-0.1.12/debian/changelog
--- libusb-0.1.12/debian/changelog
+++ libusb-0.1.12/debian/changelog
@@ -1,3 +1,24 @@
+libusb (2:0.1.12-5) unstable; urgency=low
+
+ * Stop suggesting hotplug (closes: bug#409299).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 12 Feb 2007 23:10:33 +0100
+
+libusb (2:0.1.12-4) unstable; urgency=low
+
+ * Changed usb.h to make it ANSI compliant (closes: bug#315165).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Mon, 29 Jan 2007 01:07:07 +0100
+
+libusb (2:0.1.12-3) unstable; urgency=low
+
+ * Fixed the use of select for URB transfer. Thanks to Daniel
+ Jacobowitz for the patch (closes: bug#406644).
+ * Fixed usbpp.h (closes: bug#404901).
+ * Upgraded policy compliance to 3.7.2 (no changes).
+
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 18 Jan 2007 23:12:15 +0100
+
libusb (2:0.1.12-2) unstable; urgency=low
* Fix /usr/lib/libusb.so symlink (closes: bug#360426).
diff -u libusb-0.1.12/debian/rules libusb-0.1.12/debian/rules
--- libusb-0.1.12/debian/rules
+++ libusb-0.1.12/debian/rules
@@ -153,7 +153,6 @@
mv $(CURDIR)/debian/tmp-udeb/usr/lib/libusb-0.1.so.* \
$(CURDIR)/debian/tmp-udeb/lib/
- # --list-missing would be noisy here, since there's no -dev package.
dh_install -plibusb-0.1-udeb --sourcedir=debian/tmp-udeb
# Build architecture-independent files here.
diff -u libusb-0.1.12/usb.h.in libusb-0.1.12/usb.h.in
--- libusb-0.1.12/usb.h.in
+++ libusb-0.1.12/usb.h.in
@@ -13,8 +13,9 @@
#include <unistd.h>
#include <stdlib.h>
+#include <stdint.h>
#include <limits.h>
-
+#include <sys/param.h>
#include <dirent.h>
/*
@@ -64,40 +65,40 @@
/* All standard descriptors have these 2 fields in common */
struct usb_descriptor_header {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
} __attribute__ ((packed));
/* String descriptor */
struct usb_string_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int16_t wData[1];
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint16_t wData[1];
} __attribute__ ((packed));
/* HID descriptor */
struct usb_hid_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int16_t bcdHID;
- u_int8_t bCountryCode;
- u_int8_t bNumDescriptors;
- /* u_int8_t bReportDescriptorType; */
- /* u_int16_t wDescriptorLength; */
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint16_t bcdHID;
+ uint8_t bCountryCode;
+ uint8_t bNumDescriptors;
+ /* uint8_t bReportDescriptorType; */
+ /* uint16_t wDescriptorLength; */
/* ... */
} __attribute__ ((packed));
/* Endpoint descriptor */
#define USB_MAXENDPOINTS 32
struct usb_endpoint_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int8_t bEndpointAddress;
- u_int8_t bmAttributes;
- u_int16_t wMaxPacketSize;
- u_int8_t bInterval;
- u_int8_t bRefresh;
- u_int8_t bSynchAddress;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint8_t bEndpointAddress;
+ uint8_t bmAttributes;
+ uint16_t wMaxPacketSize;
+ uint8_t bInterval;
+ uint8_t bRefresh;
+ uint8_t bSynchAddress;
unsigned char *extra; /* Extra descriptors */
int extralen;
@@ -115,15 +116,15 @@
/* Interface descriptor */
#define USB_MAXINTERFACES 32
struct usb_interface_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int8_t bInterfaceNumber;
- u_int8_t bAlternateSetting;
- u_int8_t bNumEndpoints;
- u_int8_t bInterfaceClass;
- u_int8_t bInterfaceSubClass;
- u_int8_t bInterfaceProtocol;
- u_int8_t iInterface;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint8_t bInterfaceNumber;
+ uint8_t bAlternateSetting;
+ uint8_t bNumEndpoints;
+ uint8_t bInterfaceClass;
+ uint8_t bInterfaceSubClass;
+ uint8_t bInterfaceProtocol;
+ uint8_t iInterface;
struct usb_endpoint_descriptor *endpoint;
@@ -141,14 +142,14 @@
/* Configuration descriptor information.. */
#define USB_MAXCONFIG 8
struct usb_config_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int16_t wTotalLength;
- u_int8_t bNumInterfaces;
- u_int8_t bConfigurationValue;
- u_int8_t iConfiguration;
- u_int8_t bmAttributes;
- u_int8_t MaxPower;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint16_t wTotalLength;
+ uint8_t bNumInterfaces;
+ uint8_t bConfigurationValue;
+ uint8_t iConfiguration;
+ uint8_t bmAttributes;
+ uint8_t MaxPower;
struct usb_interface *interface;
@@ -158,28 +159,28 @@
/* Device descriptor */
struct usb_device_descriptor {
- u_int8_t bLength;
- u_int8_t bDescriptorType;
- u_int16_t bcdUSB;
- u_int8_t bDeviceClass;
- u_int8_t bDeviceSubClass;
- u_int8_t bDeviceProtocol;
- u_int8_t bMaxPacketSize0;
- u_int16_t idVendor;
- u_int16_t idProduct;
- u_int16_t bcdDevice;
- u_int8_t iManufacturer;
- u_int8_t iProduct;
- u_int8_t iSerialNumber;
- u_int8_t bNumConfigurations;
+ uint8_t bLength;
+ uint8_t bDescriptorType;
+ uint16_t bcdUSB;
+ uint8_t bDeviceClass;
+ uint8_t bDeviceSubClass;
+ uint8_t bDeviceProtocol;
+ uint8_t bMaxPacketSize0;
+ uint16_t idVendor;
+ uint16_t idProduct;
+ uint16_t bcdDevice;
+ uint8_t iManufacturer;
+ uint8_t iProduct;
+ uint8_t iSerialNumber;
+ uint8_t bNumConfigurations;
} __attribute__ ((packed));
struct usb_ctrl_setup {
- u_int8_t bRequestType;
- u_int8_t bRequest;
- u_int16_t wValue;
- u_int16_t wIndex;
- u_int16_t wLength;
+ uint8_t bRequestType;
+ uint8_t bRequest;
+ uint16_t wValue;
+ uint16_t wIndex;
+ uint16_t wLength;
} __attribute__ ((packed));
/*
@@ -250,7 +251,7 @@
void *dev; /* Darwin support */
- u_int8_t devnum;
+ uint8_t devnum;
unsigned char num_children;
struct usb_device **children;
@@ -262,7 +263,7 @@
char dirname[PATH_MAX + 1];
struct usb_device *devices;
- u_int32_t location;
+ uint32_t location;
struct usb_device *root_dev;
};
only in patch2:
unchanged:
--- libusb-0.1.12.orig/linux.c
+++ libusb-0.1.12/linux.c
@@ -213,15 +213,14 @@
return ret;
}
- FD_ZERO(&writefds);
- FD_SET(dev->fd, &writefds);
-
restart:
waiting = 1;
context = NULL;
while (!urb.usercontext && ((ret = ioctl(dev->fd, IOCTL_USB_REAPURBNDELAY,
&context)) == -1) && waiting) {
tv.tv_sec = 0;
tv.tv_usec = 1000; // 1 msec
+ FD_ZERO(&writefds);
+ FD_SET(dev->fd, &writefds);
select(dev->fd + 1, NULL, &writefds, NULL, &tv); //sub second wait
if (timeout) {
only in patch2:
unchanged:
--- libusb-0.1.12.orig/usbpp.h
+++ libusb-0.1.12/usbpp.h
@@ -54,7 +54,7 @@
* \returns the number of bytes sent, or a negative value on
* failure
*/
- int bulkWrite(QByteArray message, int timeout = 100);
+ int bulkWrite(unsigned char* message, int timeout = 100);
/**
* \brief Bulk read
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
