[Fingerforce-commits] [SCM] libfprint packaging for Debian by the FingerForce Team. branch, debian, updated. debian/0.5.0-2-2-g3d7032f

[Didier Raboud]

The following commit has been merged in the debian branch:
commit 9e492717f4fe98ac7a8ec1213624bdfd263290b8
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Mar 3 13:52:36 2013 +0100

    Update kFreeBSD ETIME patch to also correct the vfs301 driver.
    
    Should fix the new kFreeBSD FTBFS.

diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
index f0f4535..27c19eb 100644
--- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
+++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
@@ -3,7 +3,7 @@ Author: Steven Chamberlain <steven at pyro.eu.org>
 Bug-Debian: http://bugs.debian.org/673704
 Forwarded: not-yet
 Reviewed-by: Didier Raboud <odyx at debian.org>
-Last-Update: 2012-05-21
+Last-Update: 2013-03-03
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/libfprint/drivers/uru4000.c
@@ -32,3 +32,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  /* 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
+@@ -21,6 +21,10 @@
+ 
+ #define FP_COMPONENT "vfs301"
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT /* For kFreeBSD */
++#endif
++
+ #include <errno.h>
+ #include <signal.h>
+ #include <string.h>
diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch
index 0751c61..68c0ed6 100644
--- a/debian/patches/use-non-versionned-libusbh-path.patch
+++ b/debian/patches/use-non-versionned-libusbh-path.patch
@@ -6,7 +6,7 @@ Author: Didier Raboud <odyx at debian.org>
 Last-Update: 2013-03-03
 --- a/libfprint/drivers/vfs301.c
 +++ b/libfprint/drivers/vfs301.c
-@@ -27,7 +27,7 @@
+@@ -31,7 +31,7 @@
  #include <stdio.h>
  #include <assert.h>
  #include <stdlib.h>

-- 
libfprint packaging for Debian by the FingerForce Team.