summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2010-06-10 00:09:36 +0200
committerGravatar Stephane Glondu <steph@glondu.net>2010-06-28 15:32:42 +0200
commit257f04de91e394cea67254da547fc1b90fa6978d (patch)
tree5ab27c68597d76fccedc919bc63cf5ca3b6c0754 /debian
parent9ffbef80b9b8674c94b0a4137bdb2de701f3b2d1 (diff)
Add 0003-Fix-build-with-OCaml-3.12.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0003-Fix-build-with-OCaml-3.12.patch28
-rw-r--r--debian/patches/series1
3 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 40e99065..17ff3b14 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@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 00000000..dbfdaaef
--- /dev/null
+++ b/debian/patches/0003-Fix-build-with-OCaml-3.12.patch
@@ -0,0 +1,28 @@
+From: Stephane Glondu <steph@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@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 4bfb4468..ab43a984 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