← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libfprint/utopic

« back to all changes in this revision

Viewing changes to debian/patches/use-non-versionned-libusbh-path.patch

  • Committer: Package Import Robot
  • Author(s): Didier Raboud
  • Date: 2013-05-18 16:35:39 UTC
  • mfrom: (4.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20130518163539-qvwsan4edkdtry6f
Tags: 1:0.5.0-5
* Upload to unstable with two more backports from upstream:
  - imgdev: fix cancelling of enrollment from stage_completed callback
  - upeke2: Add support for 147e:2020 ID

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use-non-versionned-libusbh-path.patch
 
1
Description: Use non-versionned libusb.h path
 
2
 Reference: http://thread.gmane.org/gmane.comp.lib.libusb.devel.general/11611
 
3
 .
 
4
 Hopefully fixes the kFreeBSD FTBFS.
 
5
Author: Didier Raboud <odyx@debian.org>
 
6
Last-Update: 2013-03-03
 
7
--- a/libfprint/drivers/vfs301.c
 
8
+++ b/libfprint/drivers/vfs301.c
 
9
@@ -28,7 +28,7 @@
 
10
 #include <stdio.h>
 
11
 #include <assert.h>
 
12
 #include <stdlib.h>
 
13
-#include <libusb-1.0/libusb.h>
 
14
+#include <libusb.h>
 
15
 
 
16
 #include "vfs301_proto.h"
 
17
 #include <unistd.h>
 
18
--- a/libfprint/drivers/vfs301_proto.c
 
19
+++ b/libfprint/drivers/vfs301_proto.c
 
20
@@ -33,7 +33,7 @@
 
21
 #include <stdio.h>
 
22
 #include <assert.h>
 
23
 #include <stdlib.h>
 
24
-#include <libusb-1.0/libusb.h>
 
25
+#include <libusb.h>
 
26
 
 
27
 #include "vfs301_proto.h"
 
28
 #include "vfs301_proto_fragments.h"
 
29
--- a/libfprint/drivers/vfs301_proto.h
 
30
+++ b/libfprint/drivers/vfs301_proto.h
 
31
@@ -18,7 +18,7 @@
 
32
  * License along with this library; if not, write to the Free Software
 
33
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
34
  */
 
35
-#include <libusb-1.0/libusb.h>
 
36
+#include <libusb.h>
 
37
 
 
38
 enum {
 
39
        VFS301_DEFAULT_WAIT_TIMEOUT = 300,