diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch deleted file mode 100644 index 0d7c2a1..0000000 --- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch +++ /dev/null @@ -1,60 +0,0 @@ -Description: Add missing ETIME definition for kFreeBSD flavours. -Author: Steven Chamberlain -Bug-Debian: http://bugs.debian.org/673704 -Forwarded: not-yet -Reviewed-by: Didier Raboud -Last-Update: 2013-03-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/libfprint/drivers/uru4000.c -+++ b/libfprint/drivers/uru4000.c -@@ -25,6 +25,10 @@ - - #include "drivers_api.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - #define EP_INTR (1 | LIBUSB_ENDPOINT_IN) - #define EP_DATA (2 | LIBUSB_ENDPOINT_IN) - #define USB_RQ 0x04 ---- a/libfprint/drivers/vfs101.c -+++ b/libfprint/drivers/vfs101.c -@@ -21,6 +21,10 @@ - - #include "drivers_api.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - /* Input-Output usb endpoint */ - #define EP_IN(n) (n | LIBUSB_ENDPOINT_IN) - #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT) ---- a/libfprint/drivers/vfs301.c -+++ b/libfprint/drivers/vfs301.c -@@ -24,6 +24,10 @@ - #include "drivers_api.h" - #include "vfs301_proto.h" - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - /************************** GENERIC STUFF *************************************/ - - /* Submit asynchronous sleep */ ---- a/libfprint/drivers/elan.c -+++ b/libfprint/drivers/elan.c -@@ -49,6 +49,10 @@ - else if (len > 2) \ - fp_dbg("%04x... (%d bytes)", buf[0] << 8 | buf[1], len) - -+#ifndef ETIME -+#define ETIME ETIMEDOUT /* For kFreeBSD */ -+#endif -+ - unsigned char elan_get_pixel(struct fpi_frame_asmbl_ctx *ctx, - struct fpi_frame *frame, unsigned int x, - unsigned int y) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 15f33bb..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,6 +0,0 @@ -# Upstream backports - -# Debian specifics -kFreeBSD_FTBFS_add_ETIME_definition.patch -udev-rules-creation-add-Debian-specifics.patch -use-non-versionned-libusbh-path.patch diff --git a/debian/patches/udev-rules-creation-add-Debian-specifics.patch b/debian/patches/udev-rules-creation-add-Debian-specifics.patch deleted file mode 100644 index 4eedc22..0000000 --- a/debian/patches/udev-rules-creation-add-Debian-specifics.patch +++ /dev/null @@ -1,31 +0,0 @@ -Description: Tweak the udev rules creator for Debian usage - List all devices; automatic power/control only for the non-blacklisted - ones; mode and group to all. -Author: Didier Raboud -Origin: vendor -Last-Update: 2015-03-03 - ---- a/libfprint/fprint-list-udev-rules.c -+++ b/libfprint/fprint-list-udev-rules.c -@@ -63,9 +63,6 @@ static void print_driver (struct fp_driv - break; - } - } -- if (blacklist) -- continue; -- - key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product); - - if (g_hash_table_lookup (printed, key) != NULL) { -@@ -78,7 +75,10 @@ static void print_driver (struct fp_driv - if (num_printed == 0) - printf ("# %s\n", driver->full_name); - -- printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product); -+ printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ", driver->id_table[i].vendor, driver->id_table[i].product); -+ if (!blacklist) -+ printf ("TEST==\"power/control\", ATTR{power/control}=\"auto\", "); -+ printf ("MODE=\"0664\", GROUP=\"plugdev\"\n"); - printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name); - num_printed++; - } diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch deleted file mode 100644 index 121ef7b..0000000 --- a/debian/patches/use-non-versionned-libusbh-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Use non-versionned libusb.h path - Reference: http://thread.gmane.org/gmane.comp.lib.libusb.devel.general/11611 - . - Hopefully fixes the kFreeBSD FTBFS. -Author: Didier Raboud -Last-Update: 2013-03-03 ---- a/libfprint/drivers/vfs301_proto.h -+++ b/libfprint/drivers/vfs301_proto.h -@@ -18,7 +18,7 @@ - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ --#include -+#include - - enum { - VFS301_DEFAULT_WAIT_TIMEOUT = 300, diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)