The following commit has been merged in the master branch: commit 54adcc3b5458c81185527af54af8a19f62eca6c2 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Jan 10 16:23:11 2010 +0100
Remove 0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch (fixed upstream) diff --git a/debian/changelog b/debian/changelog index 5a90cd9..d063e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ frama-c (20090902+beryllium+dfsg-1) UNRELEASED; urgency=low * New upstream release + + Remove 0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch + (fixed upstream) * Update copyright file -- Mehdi Dogguy <me...@debian.org> Sun, 10 Jan 2010 15:56:17 +0100 diff --git a/debian/patches/0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch b/debian/patches/0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch deleted file mode 100644 index e3d2054..0000000 --- a/debian/patches/0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Mehdi Dogguy <dog...@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 17d23de..a2222a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch 0002-Make-Jessie-plugin-use-Jc-from-Why-2.19.patch 0003-Add-dGraphView.cmo-when-linking.patch 0004-Use-GSourceView2.patch -- frama-c packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits