[Pkg-ocaml-maint-commits] [ocamldap] 01/02: Fix FTBFS with OCaml 4.02.3

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository ocamldap.

commit ca1fb58620c90e383a73f898dfed9063221346bc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sat Oct 17 20:50:15 2015 +0200

    Fix FTBFS with OCaml 4.02.3
---
 debian/changelog                                  |  6 ++++
 debian/patches/0002-Use-Ldap_funclient.init.patch | 37 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3d51856..d907d1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocamldap (2.1.8-10) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with OCaml 4.02.3
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 17 Oct 2015 20:47:33 +0200
+
 ocamldap (2.1.8-9) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/patches/0002-Use-Ldap_funclient.init.patch b/debian/patches/0002-Use-Ldap_funclient.init.patch
new file mode 100644
index 0000000..c6c6012
--- /dev/null
+++ b/debian/patches/0002-Use-Ldap_funclient.init.patch
@@ -0,0 +1,37 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sat, 17 Oct 2015 20:47:24 +0200
+Subject: Use Ldap_funclient.init
+
+---
+ ldap_ooclient.ml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ldap_ooclient.ml b/ldap_ooclient.ml
+index fd8b487..19b8df3 100644
+--- a/ldap_ooclient.ml
++++ b/ldap_ooclient.ml
+@@ -410,12 +410,12 @@ object (self)
+   val mutable mth = `SIMPLE
+   val mutable bound = true
+   val mutable reconnect_successful = true
+-  val mutable con = init ~connect_timeout:connect_timeout ~version:version hosts
++  val mutable con = Ldap_funclient.init ~connect_timeout:connect_timeout ~version:version hosts
+   method private reconnect =
+     if bound then unbind con;
+     bound <- false;
+     reconnect_successful <- false;
+-    con <- init ~connect_timeout:connect_timeout ~version:version hosts;
++    con <- Ldap_funclient.init ~connect_timeout:connect_timeout ~version:version hosts;
+     bound <- true;
+     bind_s ~who: bdn ~cred: pwd ~auth_method: mth con;
+     reconnect_successful <- true;
+@@ -429,7 +429,7 @@ object (self)
+ 
+   method bind ?(cred = "") ?(meth:authmethod = `SIMPLE) dn =
+     if not bound then begin
+-      con <- init ~connect_timeout:connect_timeout ~version: version hosts;
++      con <- Ldap_funclient.init ~connect_timeout:connect_timeout ~version: version hosts;
+       bound <- true
+     end;
+     bind_s ~who: dn ~cred: cred ~auth_method: meth con;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 66c2f68..c8bacc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Compile-explictly-with-pcre-and-compiler-libs.patch
+0002-Use-Ldap_funclient.init.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamldap.git