[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20100401+boron+dfsg-2-1-g854f432

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 854f43286bc01689b3b579707362f8e6d5f8d8e4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jun 14 23:40:32 2010 +0200

    Add some patches

diff --git a/debian/changelog b/debian/changelog
index 1a561bb..2922c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+frama-c (20100401+boron+dfsg-3) unstable; urgency=low
+
+  * Add some patches
+    - 0007-Fix-cpp-command-arguments.patch
+    - 0008-Fix-ai-ival.ml-filter_ge.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 14 Jun 2010 23:36:37 +0200
+
 frama-c (20100401+boron+dfsg-2) unstable; urgency=low
 
   * Make the configure script accept OCamlgraph 1.5 (Closes: #580090)
diff --git a/debian/patches/0007-Fix-cpp-command-arguments.patch b/debian/patches/0007-Fix-cpp-command-arguments.patch
new file mode 100644
index 0000000..92e6efa
--- /dev/null
+++ b/debian/patches/0007-Fix-cpp-command-arguments.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 14 Jun 2010 23:29:34 +0200
+Subject: [PATCH] Fix cpp command arguments
+
+---
+ src/kernel/file.ml |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/kernel/file.ml b/src/kernel/file.ml
+index 30c532b..042f29e 100644
+--- a/src/kernel/file.ml
++++ b/src/kernel/file.ml
+@@ -498,7 +498,7 @@ let parse = function
+ 	  in
+ 	  (* Format.eprintf "-cpp-command cmd2=|%s|@\n" cmd2; *)
+           let cmd3 =
+-	    String.sub cmdl (percent2 + 2) (String.length cmdl - percent2 + 2)
++	    String.sub cmdl (percent2 + 2) (String.length cmdl - (percent2 + 2))
+           in
+ 	  (* Format.eprintf "-cpp-command cmd3=|%s|@\n" cmd3; *)
+           Format.sprintf "%s%s %s %s%s%s" cmd1
+-- 
diff --git a/debian/patches/0008-Fix-ai-ival.ml-filter_ge.patch b/debian/patches/0008-Fix-ai-ival.ml-filter_ge.patch
new file mode 100644
index 0000000..eb39ffd
--- /dev/null
+++ b/debian/patches/0008-Fix-ai-ival.ml-filter_ge.patch
@@ -0,0 +1,24 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 14 Jun 2010 23:36:05 +0200
+Subject: [PATCH] Fix ai/ival.ml:filter_ge
+
+---
+ src/ai/ival.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ai/ival.ml b/src/ai/ival.ml
+index 1e9c174..efece8c 100644
+--- a/src/ai/ival.ml
++++ b/src/ai/ival.ml
+@@ -482,8 +482,8 @@ struct
+     then f1
+     else inject b1 e2
+ 
+-  let filter_ge (I(b1, e1) as f1) (I(b2, e2)) =
+-    let b2 = if F.equal_ieee F.minus_zero e2 then F.minus_zero else b2 in
++  let filter_ge (I(b1, e1) as f1) (I(b2, _e2)) =
++    let b2 = if F.equal_ieee F.minus_zero b2 then F.minus_zero else b2 in
+     if not (F.le b2 e1)
+     then raise Bottom
+     else if F.le b2 b1
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 190d744..efb973d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@
 0004-Fix-some-typos.patch
 0005-Don-t-modify-system-files.patch
 0006-OCamlgraph-1.5-is-compatible.patch
+0007-Fix-cpp-command-arguments.patch
+0008-Fix-ai-ival.ml-filter_ge.patch

-- 
frama-c packaging