[Pkg-ocaml-maint-commits] [mldonkey] 03/06: updated patches for 3.6.1

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository mldonkey.

commit 23056ade05bb0305dec742724431ddf978d288ec
Author: Ralf Treinen <treinen at debian.org>
Date:   Tue Nov 7 07:48:28 2017 +0100

    updated patches for 3.6.1
---
 debian/changelog                                   |  5 ++++-
 ...0001-Use-usr-bin-see-as-default-previewer.patch | 11 +++++------
 .../0004-Fix-compilation-with-OCaml-4.02.patch     | 22 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c434ac..d98bdb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 mldonkey (3.1.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Change build-dependency on libgd2-xpm-dev to libgd-dev (closes: #880775)
+  * New upstream. This release compiles on ocaml 4.05 (closes:  #876735)
+    - refreshed patch 0001-Use-usr-bin-see-as-default-previewer.patch
+    - dropped patch 0004-Fix-compilation-with-OCaml-4.02.patch
+  * Changed build-dependency on libgd2-xpm-dev to libgd-dev (closes: #880775)
   * debian/watch: point to github
 
  -- Ralf Treinen <treinen at debian.org>  Tue, 07 Nov 2017 07:37:33 +0100
diff --git a/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch b/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
index f937916..59fbbd7 100644
--- a/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
+++ b/debian/patches/0001-Use-usr-bin-see-as-default-previewer.patch
@@ -7,11 +7,11 @@ Signed-off-by: Sylvain Le Gall <gildor at debian.org>
  src/daemon/common/commonOptions.ml |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/daemon/common/commonOptions.ml b/src/daemon/common/commonOptions.ml
-index fc91bd0..4496cf0 100644
---- a/src/daemon/common/commonOptions.ml
-+++ b/src/daemon/common/commonOptions.ml
-@@ -1386,7 +1386,7 @@ let hdd_send_warning_interval = define_option current_section ["hdd_send_warning
+Index: mldonkey/src/daemon/common/commonOptions.ml
+===================================================================
+--- mldonkey.orig/src/daemon/common/commonOptions.ml	2017-11-07 07:43:44.036141365 +0100
++++ mldonkey/src/daemon/common/commonOptions.ml	2017-11-07 07:43:44.032141351 +0100
+@@ -1390,7 +1390,7 @@
  let previewer = define_expert_option current_section ["previewer"]
    "Name of program used for preview (first arg is local filename, second arg
    is name of file as searched on eDonkey"
@@ -20,4 +20,3 @@ index fc91bd0..4496cf0 100644
  
  let mldonkey_bin = define_expert_option current_section ["mldonkey_bin"]
    "Directory where mldonkey binaries are installed"
--- 
diff --git a/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch b/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch
deleted file mode 100644
index 51a7ea8..0000000
--- a/debian/patches/0004-Fix-compilation-with-OCaml-4.02.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 9889cd4..efbcb3b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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