From 9fa5335ea1932233460dcc2eecf3ba0186e477e4 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Tue, 15 Jan 2013 18:03:40 +0100 Subject: [PATCH] Refresh all patches for 0.5.0 - Drop fix-libusb-global-variables-FTBFS.patch implemented upstream. --- ...list-handling-in-udev-rules-creation.patch | 7 +- .../Fix-libusb-global-variables-FTBFS.patch | 75 ------------------- .../kFreeBSD_FTBFS_add_ETIME_definition.patch | 8 +- debian/patches/series | 1 - ...-rules-creation-add-Debian-specifics.patch | 10 +-- 5 files changed, 10 insertions(+), 91 deletions(-) delete mode 100644 debian/patches/Fix-libusb-global-variables-FTBFS.patch diff --git a/debian/patches/Fix-blacklist-handling-in-udev-rules-creation.patch b/debian/patches/Fix-blacklist-handling-in-udev-rules-creation.patch index 5ca61d50..933d2bd3 100644 --- a/debian/patches/Fix-blacklist-handling-in-udev-rules-creation.patch +++ b/debian/patches/Fix-blacklist-handling-in-udev-rules-creation.patch @@ -7,11 +7,9 @@ Subject: [PATCH] Fix blacklist handling in udev rules creation. libfprint/fprint-list-udev-rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/libfprint/fprint-list-udev-rules.c b/libfprint/fprint-list-udev-rules.c -index 182ee10..66b2cc0 100644 --- a/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c -@@ -49,7 +49,7 @@ static void print_driver (struct fp_driver *driver) +@@ -52,7 +52,7 @@ blacklist = 0; for (j = 0; blacklist_id_table[j].vendor != 0; j++) { if (driver->id_table[i].vendor == blacklist_id_table[j].vendor && @@ -20,6 +18,3 @@ index 182ee10..66b2cc0 100644 blacklist = 1; break; } --- -1.7.10 - diff --git a/debian/patches/Fix-libusb-global-variables-FTBFS.patch b/debian/patches/Fix-libusb-global-variables-FTBFS.patch deleted file mode 100644 index 3af9e689..00000000 --- a/debian/patches/Fix-libusb-global-variables-FTBFS.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: Fix FTBFS caused by generic global variables declaration. -Author: Didier Raboud -Origin: vendor -Bug: http://bugs.debian.org/680838 -Last-Update: 2012-07-08 ---- a/libfprint/core.c -+++ b/libfprint/core.c -@@ -291,25 +291,25 @@ - #ifndef ENABLE_DEBUG_LOGGING - if (!log_level) - return; -- if (level == LOG_LEVEL_WARNING && log_level < 2) -+ if (level == FPRINT_LOG_LEVEL_WARNING && log_level < 2) - return; -- if (level == LOG_LEVEL_INFO && log_level < 3) -+ if (level == FPRINT_LOG_LEVEL_INFO && log_level < 3) - return; - #endif - - switch (level) { -- case LOG_LEVEL_INFO: -+ case FPRINT_LOG_LEVEL_INFO: - prefix = "info"; - break; -- case LOG_LEVEL_WARNING: -+ case FPRINT_LOG_LEVEL_WARNING: - stream = stderr; - prefix = "warning"; - break; -- case LOG_LEVEL_ERROR: -+ case FPRINT_LOG_LEVEL_ERROR: - stream = stderr; - prefix = "error"; - break; -- case LOG_LEVEL_DEBUG: -+ case FPRINT_LOG_LEVEL_DEBUG: - stream = stderr; - prefix = "debug"; - break; ---- a/libfprint/fp_internal.h -+++ b/libfprint/fp_internal.h -@@ -33,10 +33,10 @@ - (type *)( (char *)__mptr - offsetof(type,member) );}) - - enum fpi_log_level { -- LOG_LEVEL_DEBUG, -- LOG_LEVEL_INFO, -- LOG_LEVEL_WARNING, -- LOG_LEVEL_ERROR, -+ FPRINT_LOG_LEVEL_DEBUG, -+ FPRINT_LOG_LEVEL_INFO, -+ FPRINT_LOG_LEVEL_WARNING, -+ FPRINT_LOG_LEVEL_ERROR, - }; - - void fpi_log(enum fpi_log_level, const char *component, const char *function, -@@ -53,14 +53,14 @@ - #endif - - #ifdef ENABLE_DEBUG_LOGGING --#define fp_dbg(fmt...) _fpi_log(LOG_LEVEL_DEBUG, fmt) -+#define fp_dbg(fmt...) _fpi_log(FPRINT_LOG_LEVEL_DEBUG, fmt) - #else - #define fp_dbg(fmt...) - #endif - --#define fp_info(fmt...) _fpi_log(LOG_LEVEL_INFO, fmt) --#define fp_warn(fmt...) _fpi_log(LOG_LEVEL_WARNING, fmt) --#define fp_err(fmt...) _fpi_log(LOG_LEVEL_ERROR, fmt) -+#define fp_info(fmt...) _fpi_log(FPRINT_LOG_LEVEL_INFO, fmt) -+#define fp_warn(fmt...) _fpi_log(FPRINT_LOG_LEVEL_WARNING, fmt) -+#define fp_err(fmt...) _fpi_log(FPRINT_LOG_LEVEL_ERROR, fmt) - - #ifndef NDEBUG - #define BUG_ON(condition) \ diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch index d6314686..f0f45355 100644 --- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch +++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch @@ -8,9 +8,9 @@ Last-Update: 2012-05-21 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/libfprint/drivers/uru4000.c +++ b/libfprint/drivers/uru4000.c -@@ -29,6 +29,10 @@ +@@ -32,6 +32,10 @@ - #include + #include "driver_ids.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ @@ -21,9 +21,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #define USB_RQ 0x04 --- a/libfprint/drivers/vfs101.c +++ b/libfprint/drivers/vfs101.c -@@ -25,6 +25,10 @@ +@@ -27,6 +27,10 @@ - #include + #include "driver_ids.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ diff --git a/debian/patches/series b/debian/patches/series index f590d6d3..ad7c2eac 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ kFreeBSD_FTBFS_add_ETIME_definition.patch udev-rules-creation-add-Debian-specifics.patch Fix-blacklist-handling-in-udev-rules-creation.patch -Fix-libusb-global-variables-FTBFS.patch diff --git a/debian/patches/udev-rules-creation-add-Debian-specifics.patch b/debian/patches/udev-rules-creation-add-Debian-specifics.patch index 8f9796ab..eeea189c 100644 --- a/debian/patches/udev-rules-creation-add-Debian-specifics.patch +++ b/debian/patches/udev-rules-creation-add-Debian-specifics.patch @@ -7,7 +7,7 @@ Last-Update: 2012-06-26 --- a/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c -@@ -54,9 +54,6 @@ +@@ -57,9 +57,6 @@ break; } } @@ -17,15 +17,15 @@ Last-Update: 2012-06-26 key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product); if (g_hash_table_lookup (printed, key) != NULL) { -@@ -66,7 +63,10 @@ - - g_hash_table_insert (printed, key, GINT_TO_POINTER (1)); +@@ -72,7 +69,10 @@ + if (num_printed == 0) + printf ("# %s\n", driver->full_name); - printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", 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 ("ATTR{power/control}=\"auto\", "); + printf ("MODE=\"0664\", GROUP=\"plugdev\"\n"); + num_printed++; } - }