[Pkg-ocaml-maint-commits] [mldonkey] 01/01: Fix compilation with OCaml 4.02

[Stéphane Glondu]

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

glondu pushed a commit to branch master
in repository mldonkey.

commit c245b4e6f795ebf07ba8522bcdfd2fe62ce8d0c9
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 16 09:59:21 2015 +0200

    Fix compilation with OCaml 4.02
---
 debian/changelog                                   |  6 ++++++
 .../0004-Fix-compilation-with-OCaml-4.02.patch     | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c3dc125..8c9af9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mldonkey (3.1.5-3) UNRELEASED; urgency=medium
+
+  * Fix compilation with OCaml 4.02
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 16 Jun 2015 09:59:50 +0200
+
 mldonkey (3.1.5-2) unstable; urgency=medium
 
   * Build svg_converter.byte to avoid FTBFS (Closes: #749371).
diff --git a/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch b/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch
new file mode 100644
index 0000000..51a7ea8
--- /dev/null
+++ b/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 16 Jun 2015 09:58:51 +0200
+Subject: Fix compilation with OCaml 4.02
+
+---
+ src/utils/net/terminal.ml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/net/terminal.ml b/src/utils/net/terminal.ml
+index 44a96f4..30650ed 100644
+--- a/src/utils/net/terminal.ml
++++ b/src/utils/net/terminal.ml
+@@ -185,7 +185,7 @@ module Output = struct
+   let canal = List.assoc chan !chanmap in
+   etat.chan <- Some (chan, canal);
+   info (sprintf "connecte au canal '%s'" chan);
+-  (* {| canal ALL } *)
++  (* canal ALL *)
+        with Not_found -> (* pas encore de recepteur pour ce canal *)
+   try (* on en cree un *)
+     let serveur = nsrecord.get_loc chan in
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index efbcb3b..9889cd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-usr-bin-see-as-default-previewer.patch
 0002-Remove-bashisms.patch
 0003-Fix-tiger-tree-corruption.patch
+0004-Fix-compilation-with-OCaml-4.02.patch

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