[Pkg-ocaml-maint-commits] [SCM] ocaml-usb packaging branch, master, updated. debian/1.2.0-1-2-gbbdc765

[Stephane Glondu]

The following commit has been merged in the master branch:
commit bbdc7657f3a8f28a74efcbfef6ec5acb2937ed04
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 2 12:18:27 2011 +0200

    Include stdint.h before libusb.h (fixes FTBFS on kfreebsd-*)

diff --git a/debian/changelog b/debian/changelog
index d82fb17..0717a7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-usb (1.2.0-2) unstable; urgency=low
+
+  * Add patch to include stdint.h before libusb.h (fixes FTBFS on
+    kfreebsd-*)
+
+ -- Stéphane Glondu <glondu at debian.org>  Sat, 02 Jul 2011 12:17:46 +0200
+
 ocaml-usb (1.2.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0002-Include-stdint.h-before-libusb.h.patch b/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
new file mode 100644
index 0000000..da81643
--- /dev/null
+++ b/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 2 Jul 2011 12:16:03 +0200
+Subject: Include stdint.h before libusb.h
+
+Fixes FTBFS on kfreebsd-*.
+---
+ src/usb_stubs.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/usb_stubs.c b/src/usb_stubs.c
+index a072c7f..c6a3a38 100644
+--- a/src/usb_stubs.c
++++ b/src/usb_stubs.c
+@@ -14,6 +14,7 @@
+ #include <caml/fail.h>
+ #include <caml/callback.h>
+ #include <caml/signals.h>
++#include <stdint.h>
+ #include <libusb.h>
+ #include <poll.h>
+ #include <string.h>
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index ced054b..e8e97f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Register-the-pollfds-created-before-the-handlers-are.patch
+0002-Include-stdint.h-before-libusb.h.patch

-- 
ocaml-usb packaging