diff --git a/debian/changelog b/debian/changelog index 1f413141..93402e8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libfprint (1:0.7.0-1) UNRELEASED; urgency=medium * Team upload. * New 0.7.0 upstream release: - Add VFS0050 driver (Closes: #843626) + - Refresh the patches, drop all the upstreamed ones - -- Laurent Bigonville Tue, 16 May 2017 10:53:55 +0200 + -- Laurent Bigonville Tue, 16 May 2017 11:27:16 +0200 libfprint (1:0.6.0-2) unstable; urgency=low diff --git a/debian/patches/0001-imgdev-fix-enum-mismatch-for-dev_change_state-call.patch b/debian/patches/0001-imgdev-fix-enum-mismatch-for-dev_change_state-call.patch deleted file mode 100644 index d726e9b6..00000000 --- a/debian/patches/0001-imgdev-fix-enum-mismatch-for-dev_change_state-call.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9f408bf51b7740e87c3d0b90e5adc5de3c37c052 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Tue, 7 Oct 2014 08:18:41 +0300 -Subject: [PATCH 1/2] imgdev: fix enum mismatch for dev_change_state() call -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This bug has existed long time, but it was uncovered by commit -e215b0509448 which enabled multiple enrollment rounds. - -In practice this broke (at least) URU4000 driver state machine -causing it to enter indefinite loop - due to the invalid state -change callback. - -Patch originally posted at: -http://lists.freedesktop.org/archives/fprint/2014-June/000603.html - -Test and verification results: -http://lists.freedesktop.org/archives/fprint/2014-June/000607.html - -Signed-off-by: Timo Teräs ---- - libfprint/imgdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfprint/imgdev.c b/libfprint/imgdev.c -index f960ee3..3b5d3f3 100644 ---- a/libfprint/imgdev.c -+++ b/libfprint/imgdev.c -@@ -159,7 +159,7 @@ void fpi_imgdev_report_finger_status(struct fp_img_dev *imgdev, - r > 0 && r != FP_ENROLL_COMPLETE && r != FP_ENROLL_FAIL) { - imgdev->action_result = 0; - imgdev->action_state = IMG_ACQUIRE_STATE_AWAIT_FINGER_ON; -- dev_change_state(imgdev, IMG_ACQUIRE_STATE_AWAIT_FINGER_ON); -+ dev_change_state(imgdev, IMGDEV_STATE_AWAIT_FINGER_ON); - } - break; - case IMG_ACTION_VERIFY: --- -2.1.4 - diff --git a/debian/patches/0002-vfs101-Logical-conjunction-always-evaluates-to-false.patch b/debian/patches/0002-vfs101-Logical-conjunction-always-evaluates-to-false.patch deleted file mode 100644 index f7b67dce..00000000 --- a/debian/patches/0002-vfs101-Logical-conjunction-always-evaluates-to-false.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 45fb6d790815eec3d9e08a9e459a325fbb9addc0 Mon Sep 17 00:00:00 2001 -From: Carlos Olmedo Escobar -Date: Fri, 6 Feb 2015 17:22:16 +0100 -Subject: [PATCH 2/2] vfs101: Logical conjunction always evaluates to false. - ---- - libfprint/drivers/vfs101.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c -index db0b06e..84624eb 100644 ---- a/libfprint/drivers/vfs101.c -+++ b/libfprint/drivers/vfs101.c -@@ -186,7 +186,7 @@ static int result_codes[2][RESULT_COUNT] = - static int result_code(struct fp_img_dev *dev, int result) - { - /* Check result value */ -- if (result < 0 && result >= RESULT_COUNT) -+ if (result < 0 || result >= RESULT_COUNT) - return result; - - /* Return result code */ --- -2.1.4 - diff --git a/debian/patches/series b/debian/patches/series index 5a4230f3..15f33bb4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ # Upstream backports -0001-imgdev-fix-enum-mismatch-for-dev_change_state-call.patch -0002-vfs101-Logical-conjunction-always-evaluates-to-false.patch # Debian specifics kFreeBSD_FTBFS_add_ETIME_definition.patch diff --git a/debian/patches/udev-rules-creation-add-Debian-specifics.patch b/debian/patches/udev-rules-creation-add-Debian-specifics.patch index 677d023a..650f0ae0 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: 2015-03-03 --- a/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c -@@ -59,9 +59,6 @@ +@@ -61,9 +61,6 @@ static void print_driver (struct fp_driv break; } } @@ -17,7 +17,7 @@ Last-Update: 2015-03-03 key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product); if (g_hash_table_lookup (printed, key) != NULL) { -@@ -74,7 +71,10 @@ +@@ -76,7 +73,10 @@ static void print_driver (struct fp_driv if (num_printed == 0) printf ("# %s\n", driver->full_name); @@ -26,6 +26,6 @@ Last-Update: 2015-03-03 + 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++; } -