[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090902+beryllium+dfsg-3-1-g7386e02

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 7386e02a069a9b29cfaa0f162a3fd0dfc4013f24
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Feb 11 20:58:07 2010 +0100

    Make it compile with OCaml 3.11.2

diff --git a/debian/changelog b/debian/changelog
index 4e7e177..9f09dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+frama-c (20090902+beryllium+dfsg-4) unstable; urgency=low
+
+  * Make it compile with OCaml 3.11.2 (Closes: #569260)
+    - Add 0004-temp_file-changed-in-OCaml-3.11.2.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 11 Feb 2010 20:57:17 +0100
+
 frama-c (20090902+beryllium+dfsg-3) unstable; urgency=low
 
   * Fix FTBFS on bytecode architectures
diff --git a/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch b/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch
new file mode 100644
index 0000000..c56da8a
--- /dev/null
+++ b/debian/patches/0004-temp_file-changed-in-OCaml-3.11.2.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 11 Feb 2010 20:56:48 +0100
+Subject: [PATCH] temp_file changed in OCaml 3.11.2
+
+---
+ ptests/ptests.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ptests/ptests.ml b/ptests/ptests.ml
+index 5e5df70..6931a66 100644
+--- a/ptests/ptests.ml
++++ b/ptests/ptests.ml
+@@ -54,7 +54,7 @@ module Filename = struct
+       fun a b -> let r = temp_file a b in
+ 	cygpath r
+     else
+-      temp_file
++      (fun x y -> temp_file x y)
+ end
+ 
+ let default_env var value =
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2381cb1..1449896 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-GSourceView2.patch
 0002-Fix-hyphen-used-as-minus-sign.patch
 0003-Do-not-install-native-Kernel-modules-on-bytecode-arc.patch
+0004-temp_file-changed-in-OCaml-3.11.2.patch

-- 
frama-c packaging