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

[Didier Raboud]

The following commit has been merged in the debian branch:
commit e146b9bf05694d4c6bcc866382cd4edcc5470b4c
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Mar 3 15:21:26 2013 +0100

    Correct the kFreeBSD ETIME patch update to define ETIME later.
    
    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 27c19eb..bf8aefd 100644
--- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
+++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch
@@ -34,14 +34,22 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #define EP_OUT(n)	(n | LIBUSB_ENDPOINT_OUT)
 --- a/libfprint/drivers/vfs301.c
 +++ b/libfprint/drivers/vfs301.c
-@@ -21,6 +21,10 @@
+@@ -21,6 +21,7 @@
  
  #define FP_COMPONENT "vfs301"
  
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT /* For kFreeBSD */
-+#endif
 +
  #include <errno.h>
  #include <signal.h>
  #include <string.h>
+@@ -36,6 +37,10 @@
+ 
+ #include "driver_ids.h"
+ 
++#ifndef ETIME
++#define ETIME ETIMEDOUT /* For kFreeBSD */
++#endif
++
+ /************************** GENERIC STUFF *************************************/
+ 
+ /* Callback of asynchronous sleep */
diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch
index 68c0ed6..b767d15 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
-@@ -31,7 +31,7 @@
+@@ -28,7 +28,7 @@
  #include <stdio.h>
  #include <assert.h>
  #include <stdlib.h>

-- 
libfprint packaging for Debian by the FingerForce Team.