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

[Didier Raboud]

The following commit has been merged in the debian branch:
commit ba44808b7e37aa107b98c30218c2f26bc705b680
Author: Didier Raboud <odyx at debian.org>
Date:   Sun Mar 3 12:54:29 2013 +0100

    Patch vfs301 driver to look for libusb.h without the versionned path.
    
    Hopefully fixes the kFreeBSD FTBFS.

diff --git a/debian/patches/series b/debian/patches/series
index 113aa78..390bc7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ u8a87ba4-uru4000-fix-cancelling-of-imaging-from-error-callbac.patch
 kFreeBSD_FTBFS_add_ETIME_definition.patch
 udev-rules-creation-add-Debian-specifics.patch
 Fix-blacklist-handling-in-udev-rules-creation.patch
+use-non-versionned-libusbh-path.patch
diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch
new file mode 100644
index 0000000..0751c61
--- /dev/null
+++ b/debian/patches/use-non-versionned-libusbh-path.patch
@@ -0,0 +1,39 @@
+Description: Use non-versionned libusb.h path
+ Reference: http://thread.gmane.org/gmane.comp.lib.libusb.devel.general/11611
+ .
+ Hopefully fixes the kFreeBSD FTBFS.
+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 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <stdlib.h>
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ 
+ #include "vfs301_proto.h"
+ #include <unistd.h>
+--- a/libfprint/drivers/vfs301_proto.c
++++ b/libfprint/drivers/vfs301_proto.c
+@@ -33,7 +33,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <stdlib.h>
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ 
+ #include "vfs301_proto.h"
+ #include "vfs301_proto_fragments.h"
+--- a/libfprint/drivers/vfs301_proto.h
++++ b/libfprint/drivers/vfs301_proto.h
+@@ -18,7 +18,7 @@
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ 
+ enum {
+ 	VFS301_DEFAULT_WAIT_TIMEOUT = 300,

-- 
libfprint packaging for Debian by the FingerForce Team.