The following commit has been merged in the master branch:
commit 70aa942f155f5e45f789e31a0faaffd6d978de13
Author: Mehdi Dogguy
Date: Mon Jan 2 14:45:08 2012 +0100
add 0003-Fix-spelling-error-in-binary.patch
diff --git a/debian/changelog b/debian/changelog
index 50aa5e7..ae085cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,9 +6,10 @@ frama-c (20111001+nitrogen+dfsg-1) unstable; urgency=low
- remove 0002-Fix-for-issue-727.patch
- rebase 0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
- update 0004-Accept-ocamlgraph-1.8.patch
+- add 0003-Fix-spelling-error-in-binary.patch
* Bump minimum requirement for ocamlgraph to 1.8.
- -- Mehdi Dogguy Thu, 15 Dec 2011 19:37:53 +0100
+ -- Mehdi Dogguy Mon, 02 Jan 2012 14:44:40 +0100
frama-c (20110201+carbon+dfsg-2) unstable; urgency=low
diff --git a/debian/patches/0003-Fix-spelling-error-in-binary.patch
b/debian/patches/0003-Fix-spelling-error-in-binary.patch
new file mode 100644
index 000..3e439ef
--- /dev/null
+++ b/debian/patches/0003-Fix-spelling-error-in-binary.patch
@@ -0,0 +1,171 @@
+From: Mehdi Dogguy
+Date: Mon, 2 Jan 2012 14:36:52 +0100
+Subject: Fix spelling-error-in-binary
+
+---
+ Changelog |8
+ cil/src/cil.ml|2 +-
+ cil/src/ext/cfg.mli |2 +-
+ cil/src/frontc/cabs2cil.ml|2 +-
+ cil/src/logic/logic_typing.ml |6 +++---
+ man/frama-c.1 |2 +-
+ src/impact/register.ml|4 ++--
+ src/kernel/cmdline.mli|2 +-
+ 8 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/Changelog b/Changelog
+index e527189..909b359 100644
+--- a/Changelog
b/Changelog
+@@ -576,7 +576,7 @@ o* Cil [2010/12/20] Fixed bug #645.
Ast_info.constant_expr,
+ mkAddrOrStartOf,mkString,parseInt,sizeOf] no longer use
+ an optional argument ?loc. It is now a non optional labeled
+ argument. Previous default value of loc was
+-~loc:Cil_datatype.Location.unkown which is most of the time
++~loc:Cil_datatype.Location.unknown which is most of the time
+ not accurate.
+
+ ###
+@@ -729,7 +729,7 @@ o Cil[2010/06/04] Support for custom extension in
grammar of behaviors.
+ -* Cil[2010/05/31] Extended grammar of pragma lines.
+ o* Cil[2010/05/28] Fix bug #489: constant literal present in original
+ source are preserved in the AST. NB: this implies that they might
+-be explicitely cast when an integer conversion occur.
++be explicitly cast when an integer conversion occur.
+ -* Kernel [2010/05/28] Fixed bug in handling of -cpp-command
+ o! Cil[2010/05/21] Remove deprecated annotation_status of AAssert
+ in the AST
+@@ -908,7 +908,7 @@ o! Kernel [2009/11/24] Use of global logic constants
is now a
+ - Value [2009/11/24] Handling of behavior-specific assertions now
+ correct (albeit imprecise).
+ -! Kernel [2009/11/19] The journal is generated only if the GUI is
+-crashing, or if the option -journal-enable is explicitely
++crashing, or if the option -journal-enable is explicitly
+ set (fixed issue #!330).
+ +- Value [2009/11/19] New option -slevel-exclude f for fine-tuning
+ semantic unrolling.
+@@ -1206,7 +1206,7 @@ o! Kernel [2009/01/23] File.pretty does not take
anymore a formatter
+ -* Journal[2009/01/19] Fixed bug with -disable-journal and type with
+ no pretty-printer.
+ - Configure [2009/01/19] New option -with-all-static in order to
+-statically link all plug-ins, except those explicitely
++statically link all plug-ins, except those explicitly
+ specified as dynamic (bts #?430).
+ -* Journal[2009/01/19] Fixed bug in journalisation of non-functional
values.
+ -* Makefile [2009/01/19] Fixed bug whenever all plug-ins should be static.
+diff --git a/cil/src/cil.ml b/cil/src/cil.ml
+index 8fb03a2..ea04622 100644
+--- a/cil/src/cil.ml
b/cil/src/cil.ml
+@@ -8880,7 +8880,7 @@ let rec mkCastT ~(e: exp) ~(oldt: typ) ~(newt: typ) =
+ (* Watch out for constants *)
+ match newt, e.enode with
+ (* In the case were we have a representation for the literal,
+- add explicitely the cast. *)
++ add explicitly the cast. *)
+ TInt(newik, []), Const(CInt64(i, _, None)) -> kinteger64 ~loc newik i
+ | _ ->
+ new_exp
+diff --git a/cil/src/ext/cfg.mli b/cil/src/ext/cfg.mli
+index 1467255..f40ad47 100644
+--- a/cil/src/ext/cfg.mli
b/cil/src/ext/cfg.mli
+@@ -51,7 +51,7 @@ open Cil_types
+ (** Compute the CFG for an entire file, by calling cfgFun on each function. *)
+ val computeFileCFG: file -> unit
+
+-(** clear the sid (except when clear_id is explicitely set to false),
++(** clear the sid (except when clear_id is explicitly set to
