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

[Stephane Glondu]

The following commit has been merged in the master branch:
commit dc63d578943386828e55ce4b2dc5634e988a5f79
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu May 9 23:38:07 2013 +0200

    Remove obsolete patches

diff --git a/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch b/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
deleted file mode 100644
index 0340bda..0000000
--- a/debian/patches/0001-Register-the-pollfds-created-before-the-handlers-are.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
-Date: Thu, 19 May 2011 22:47:16 +0200
-Subject: Register the pollfds created before the handlers are registered
-
-Patch forwarded (and applied) upstream in
-https://forge.ocamlcore.org/plugins/scmdarcs/cgi-bin/darcsweb.cgi?r=ocaml-usb/ocaml-usb;a=commit;h=20110519163209-c41ad-dd065e2dac213cf793b1cf9a3ee193bea88177cc.gz
-https://forge.ocamlcore.org/plugins/scmdarcs/cgi-bin/darcsweb.cgi?r=ocaml-usb/ocaml-usb;a=commit;h=20110519193825-c41ad-4b108fe46b693e4b262442602c8f761bd5bedbd4.gz
----
- src/usb_stubs.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/src/usb_stubs.c b/src/usb_stubs.c
-index b9f0e9d..a072c7f 100644
---- a/src/usb_stubs.c
-+++ b/src/usb_stubs.c
-@@ -140,9 +140,24 @@ static void ml_usb_remove_pollfd(int fd, void *user_data)
- 
- CAMLprim value ml_usb_init()
- {
-+
-+  const struct libusb_pollfd** pollfds = NULL;
-+
-+  int i = 0;
-+
-   int res = libusb_init(NULL);
-   if (res) ml_usb_error(res, "init");
- 
-+  pollfds = libusb_get_pollfds(NULL);
-+
-+
-+  if (pollfds) {
-+    for (i = 0; pollfds[i] != NULL; i++ ) {
-+      ml_usb_add_pollfd(pollfds[i]->fd, pollfds[i]->events, NULL);
-+    }
-+    free(pollfds);
-+  }
-+
-   libusb_set_pollfd_notifiers(NULL,
-                               ml_usb_add_pollfd,
-                               ml_usb_remove_pollfd,
--- 
diff --git a/debian/patches/0002-Include-stdint.h-before-libusb.h.patch b/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
deleted file mode 100644
index da81643..0000000
--- a/debian/patches/0002-Include-stdint.h-before-libusb.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index e8e97f9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Register-the-pollfds-created-before-the-handlers-are.patch
-0002-Include-stdint.h-before-libusb.h.patch

-- 
ocaml-usb packaging