[Pkg-ocaml-maint-commits] [SCM] mldonkey packaging branch, master, updated. debian/3.0.1-1-2-gc8b266f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c8b266fcfa372d2079d859c7ba06c7693493f661
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 15 21:27:36 2010 -0700

    Add ocaml_312_typechecking.dpatch (Closes: #580087)

diff --git a/debian/changelog b/debian/changelog
index 3ab6375..fc3efe4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 mldonkey (3.0.1-2) UNRELEASED; urgency=low
 
-  * debian/patches:
+  * debian/patches: (Closes: #580087)
     - rename ocaml_3.11.1.dpatch into ocaml_3.1x.dpatch, and adapt it
-      so that all 3.1x.* are accepted (Closes: #580087)
+      so that all 3.1x.* are accepted
+    - add ocaml_312_typechecking.dpatch
 
- -- Stéphane Glondu <glondu at debian.org>  Tue, 18 May 2010 15:48:43 +0200
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 15 Jun 2010 21:27:49 -0700
 
 mldonkey (3.0.1-1) unstable; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 15f342e..738a682 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_see
 ocaml_3.1x
 remove_bashism
+ocaml_312_typechecking
diff --git a/debian/patches/ocaml_312_typechecking.dpatch b/debian/patches/ocaml_312_typechecking.dpatch
new file mode 100755
index 0000000..9d9c5a5
--- /dev/null
+++ b/debian/patches/ocaml_312_typechecking.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ocaml_312_typechecking.dpatch by Stéphane Glondu <glondu at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix build with OCaml 3.12 (Closes: #580087)
+
+ at DPATCH@
+diff --git a/src/gtk2/gui/guiTemplates.mli b/src/gtk2/gui/guiTemplates.mli
+index e7a024f..e42ae70 100644
+--- a/src/gtk2/gui/guiTemplates.mli
++++ b/src/gtk2/gui/guiTemplates.mli
+@@ -125,9 +125,10 @@ module Gview :
+           method update_item : Gtk.tree_iter -> V.item -> V.item -> unit
+         end
+ 
+-      class treeview : [> Gtk.box] Gtk.obj ->
++      class treeview : ([> Gtk.box] as 'a) Gtk.obj ->
+         object
+           inherit GPack.box
++          val obj : 'a Gtk.obj
+           method expanded_paths : int array list
+           method gview : g_view
+           method id : int
+diff --git a/src/gtk2/gui/guiTools.mli b/src/gtk2/gui/guiTools.mli
+index 3e13ab5..66140c8 100644
+--- a/src/gtk2/gui/guiTools.mli
++++ b/src/gtk2/gui/guiTools.mli
+@@ -174,6 +174,7 @@ type b_children =
+ class tool_bar : ([> Gtk.box] as 'a) Gtk.obj ->
+   object
+     inherit GPack.box
++    val obj : 'a Gtk.obj
+     val mutable bb_children : b_children list
+     method add_toggle_button : 
+       style : Gtk.Tags.toolbar_style ->

-- 
mldonkey packaging