The following commit has been merged in the master branch:
commit decd56b430b648f3a8db8a8cefc40c9e7a7498c4
Author: Mehdi Dogguy
Date: Tue Jun 25 22:04:38 2013 +0200
Update patches.
- Disable 0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
- Remove 0002-Accept-ocamlgraph-1.8.patch, fixed upstream
- Remove 0006-Patchlevel2-for-Nitrogen-20111001.patch, integrated
diff --git a/debian/changelog b/debian/changelog
index b11834f..4803605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
frama-c (20130601+fluorine3+dfsg-1) UNRELEASED; urgency=low
* New upstream release
+- Remove 0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch, fixed
+ upstream
+- Remove 0002-Accept-ocamlgraph-1.8.patch, fixed upstream
+- Remove 0006-Patchlevel2-for-Nitrogen-20111001.patch, integrated
-- Mehdi Dogguy Tue, 25 Jun 2013 21:51:45 +0200
diff --git a/debian/patches/0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
b/debian/patches/0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
deleted file mode 100644
index adaf32d..000
--- a/debian/patches/0001-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Mehdi Dogguy
-Date: Mon, 25 Apr 2011 12:01:09 +0200
-Subject: Add +ocamlgraph to DYN_{O,B}LINKFLAGS
-
- Makefile |4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b70d794..6432662 100644
a/Makefile
-+++ b/Makefile
-@@ -1324,11 +1324,11 @@ share/Makefile.kernel: Makefile share/Makefile.config
share/Makefile.common
- $(ECHO) "DYN_OPT_LIBS=$(filter-out $(GEN_OPT_LIBS), $(OPT_LIBS))" >> $@
- $(ECHO) "DYN_ALL_BATCH_CMX=$(addprefix $(FRAMAC_TOP_SRCDIR)/,
$(ALL_BATCH_CMX))" >> $@
- $(ECHO) "else" >> $@
-- $(ECHO) "DYN_BLINKFLAGS=$(filter-out $(INCLUDES), $(BLINKFLAGS))" >> $@
-+ $(ECHO) "DYN_BLINKFLAGS=$(filter-out $(INCLUDES), $(BLINKFLAGS)) -I
+ocamlgraph" >> $@
- $(ECHO) "DYN_GEN_BYTE_LIBS=$(addprefix $(FRAMAC_LIBDIR)/, $(notdir
$(GEN_BYTE_LIBS)))" >> $@
- $(ECHO) "DYN_BYTE_LIBS=$(filter-out $(GEN_BYTE_LIBS), $(BYTE_LIBS))" >>
$@
- $(ECHO) "DYN_ALL_BATCH_CMO=$(addprefix $(FRAMAC_LIBDIR)/, $(notdir
$(ALL_BATCH_CMO)))" >> $@
-- $(ECHO) "DYN_OLINKFLAGS=$(filter-out $(INCLUDES), $(OLINKFLAGS))" >> $@
-+ $(ECHO) "DYN_OLINKFLAGS=$(filter-out $(INCLUDES), $(OLINKFLAGS)) -I
+ocamlgraph" >> $@
- $(ECHO) "DYN_GEN_OPT_LIBS=$(addprefix $(FRAMAC_LIBDIR)/, $(notdir
$(GEN_OPT_LIBS)))" >> $@
- $(ECHO) "DYN_OPT_LIBS=$(filter-out $(GEN_OPT_LIBS), $(OPT_LIBS))" >> $@
- $(ECHO) "DYN_ALL_BATCH_CMX=$(addprefix $(FRAMAC_LIBDIR)/, $(notdir
$(ALL_BATCH_CMX)))" >> $@
---
diff --git a/debian/patches/0001-Fix-spelling-error-in-binary.patch
b/debian/patches/0001-Fix-spelling-error-in-binary.patch
new file mode 100644
index 000..d635ea1
--- /dev/null
+++ b/debian/patches/0001-Fix-spelling-error-in-binary.patch
@@ -0,0 +1,68 @@
+From: Mehdi Dogguy
+Date: Mon, 2 Jan 2012 14:36:52 +0100
+Subject: Fix spelling-error-in-binary
+
+---
+ Changelog |4 ++--
+ cil/src/frontc/cabs2cil.ml |4 ++--
+ man/frama-c.1 |2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Changelog b/Changelog
+index aaae442..5f972ef 100644
+--- a/Changelog
b/Changelog
+@@ -219,7 +219,7 @@ o! Kernel [2012/11/24] Various types whose names
started by t_ in
+ o Rte[2012/11/23] Export function "exp_annotations" to get RTEs of a
C
+ expression as annotations.
+ o*!Kernel [2012/11/23] Added TLogic_coerce constructor to mark
+-explicitely a conversion from a C type to a logical one
++explicitly a conversion from a C type to a logical one
+ (in particular floating point -> real and integral -> integer).
+ Fixes issue #1309.
+ o! Kernel [2012/11/22] Remove unintuitive ?prj argument from Cil visitors,
+@@ -1237,7 +1237,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.
+
+ ###
+diff --git a/cil/src/frontc/cabs2cil.ml b/cil/src/frontc/cabs2cil.ml
+index 8351fc2..23d7769 100644
+--- a/cil/src/frontc/cabs2cil.ml
b/cil/src/frontc/cabs2cil.ml
+@@ -2233,7 +2233,7 @@ let makeGlobalVarinfo (isadef: bool) (vi: varinfo) :
varinfo * bool =
+* local. This can happen when we declare an extern variable with
+* global scope but we are in a local scope. *)
+
+-(* We lookup in the environement. If this is extern inline then the name
++(* We lookup in the environment. If
