Other patches: Refreshed

This commit is contained in:
Laurent Bigonville
2019-07-12 00:15:17 +02:00
parent 6fc665135d
commit 8fbeacf13b
4 changed files with 8 additions and 18 deletions
+2 -1
View File
@@ -3,10 +3,11 @@ libfprint (1:0.99.0-1) UNRELEASED; urgency=medium
* New upstream release
- d/p/lib-Add-accessor-for-minutia-coordinates.patch,
d/p/fix_ftbfs_meson.patch: Dropped, applied upstream
- Other patches: Refreshed
* debian/gbp.conf: Set pristine-tar and upstream-vcs-tag
* debian/control: Update Vcs-* fields (Closes: #909256)
-- Laurent Bigonville <bigon@debian.org> Fri, 12 Jul 2019 00:13:48 +0200
-- Laurent Bigonville <bigon@debian.org> Fri, 12 Jul 2019 00:15:03 +0200
libfprint (1:0.8.2-3) unstable; urgency=medium
+4 -4
View File
@@ -44,12 +44,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
/************************** GENERIC STUFF *************************************/
/* Callback of asynchronous sleep */
/* Submit asynchronous sleep */
--- a/libfprint/drivers/elan.c
+++ b/libfprint/drivers/elan.c
@@ -23,6 +23,10 @@
#include "drivers_api.h"
#include "elan.h"
@@ -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 */
@@ -7,7 +7,7 @@ Last-Update: 2015-03-03
--- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c
@@ -61,9 +61,6 @@ static void print_driver (struct fp_driv
@@ -63,9 +63,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) {
@@ -76,7 +73,10 @@ static void print_driver (struct fp_driv
@@ -78,7 +75,10 @@ static void print_driver (struct fp_driv
if (num_printed == 0)
printf ("# %s\n", driver->full_name);
-11
View File
@@ -15,14 +15,3 @@ Last-Update: 2013-03-03
enum {
VFS301_DEFAULT_WAIT_TIMEOUT = 300,
--- a/libfprint/drivers/vfs301_proto.c
+++ b/libfprint/drivers/vfs301_proto.c
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <glib.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
#include "vfs301_proto.h"
#include "vfs301_proto_fragments.h"