[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090601.beta1+dfsg-1-3-g8f6cc2a

Mehdi Dogguy dogguy at pps.jussieu.fr
Tue Sep 1 14:57:30 UTC 2009


The following commit has been merged in the master branch:
commit 7d594fc26bbfc872891417f4ecc54c935bb09231
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Sep 1 10:19:05 2009 +0200

    Add a patch to fix weak pattern-matching

diff --git a/debian/patches/0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch b/debian/patches/0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
new file mode 100644
index 0000000..e3d2054
--- /dev/null
+++ b/debian/patches/0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
@@ -0,0 +1,21 @@
+From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Date: Tue, 1 Sep 2009 10:17:52 +0200
+Subject: [PATCH] Fix weak pattern-matching in dynlink_lower_311_byte.ml
+
+---
+ src/lib/dynlink_lower_311_byte.ml |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/lib/dynlink_lower_311_byte.ml b/src/lib/dynlink_lower_311_byte.ml
+index 58e0ee5..fc2705e 100644
+--- a/src/lib/dynlink_lower_311_byte.ml
++++ b/src/lib/dynlink_lower_311_byte.ml
+@@ -84,6 +84,7 @@ let from_dynlink_error = function
+   | Dynlink.Corrupted_interface s -> Corrupted_interface s
+   | Dynlink.File_not_found s -> File_not_found s
+   | Dynlink.Cannot_open_dll s -> Cannot_open_dll s
++  | Dynlink.Inconsistent_implementation s -> Inconsistent_implementation s
+ 
+ let stub_error f x = 
+   try f x with Dynlink.Error e -> raise (Error (from_dynlink_error e))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 82bdf03..9d296ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0006-Do-not-install-non-existant-files.patch
 0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
+0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch

-- 
frama-c packaging



More information about the Pkg-ocaml-maint-commits mailing list