[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.2.pl1+dfsg-6-1-g257f04d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 257f04de91e394cea67254da547fc1b90fa6978d
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Jun 10 00:09:36 2010 +0200

    Add 0003-Fix-build-with-OCaml-3.12.patch

diff --git a/debian/changelog b/debian/changelog
index 40e9906..17ff3b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+coq (8.2.pl1+dfsg-7) UNRELEASED; urgency=low
+
+  * Add 0003-Fix-build-with-OCaml-3.12.patch (Closes: #585452)
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 28 Jun 2010 15:32:29 +0200
+
 coq (8.2.pl1+dfsg-6) unstable; urgency=low
 
   * Add Disable-micromega-tests.patch (workaround for bug #570920)
diff --git a/debian/patches/0003-Fix-build-with-OCaml-3.12.patch b/debian/patches/0003-Fix-build-with-OCaml-3.12.patch
new file mode 100644
index 0000000..dbfdaae
--- /dev/null
+++ b/debian/patches/0003-Fix-build-with-OCaml-3.12.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 9 Jun 2010 23:55:56 +0200
+Subject: [PATCH] Fix build with OCaml 3.12
+
+Applied-Upstream: https://gforge.inria.fr/scm/viewvc.php?view=rev&root=coq&revision=13105
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585452
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ ide/undo_lablgtk_ge212.mli |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/ide/undo_lablgtk_ge212.mli b/ide/undo_lablgtk_ge212.mli
+index 916a06e..4488b5e 100644
+--- a/ide/undo_lablgtk_ge212.mli
++++ b/ide/undo_lablgtk_ge212.mli
+@@ -10,9 +10,10 @@
+ 
+ (* An undoable view class *)
+ 
+-class undoable_view : [> Gtk.text_view] Gtk.obj ->
++class undoable_view : ([> Gtk.text_view] as 'a) Gtk.obj ->
+ object
+   inherit GText.view
++  val obj : 'a Gtk.obj
+   method undo : bool
+   method redo : bool
+   method clear_undo : unit
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4bfb446..ab43a98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Update-for-why-2.19.patch
 0002-Disable-micromega-tests.patch
+0003-Fix-build-with-OCaml-3.12.patch

-- 
coq packaging