[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20110201+carbon+dfsg-1-1-g550cd4f

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 550cd4f72562e995f4e582014acc520d762f4220
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Apr 25 12:06:27 2011 +0200

    Add "-I +ocamlgraph" to DYN_{O,B}LINKFLAGS, needed for plugins to link.

diff --git a/debian/changelog b/debian/changelog
index ba1856a..c1a9293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+frama-c (20110201+carbon+dfsg-2) unstable; urgency=low
+
+  * Add "-I +ocamlgraph" to DYN_{O,B}LINKFLAGS, needed for plugins to link.
+    - add 0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
+    - add libocamlgraph-ocaml-dev to frama-c-base's runtime dependencies.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 25 Apr 2011 12:03:31 +0200
+
 frama-c (20110201+carbon+dfsg-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 87632d1..e5be7c6 100644
--- a/debian/control
+++ b/debian/control
@@ -54,6 +54,7 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
+ libocamlgraph-ocaml-dev,
  gcc,
 Recommends:
  alt-ergo,
diff --git a/debian/patches/0001-Value-Analysis-Carbon-patchlevel-1.patch b/debian/patches/0001-Value-Analysis-Carbon-patchlevel-1.patch
index 5b9f808..5bf51b9 100644
--- a/debian/patches/0001-Value-Analysis-Carbon-patchlevel-1.patch
+++ b/debian/patches/0001-Value-Analysis-Carbon-patchlevel-1.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Fri, 15 Apr 2011 22:36:09 +0200
-Subject: [PATCH] Value Analysis Carbon patchlevel 1
+Subject: Value Analysis Carbon patchlevel 1
 
 ---
  src/ai/abstract_interp.ml        |    8 +-
diff --git a/debian/patches/0002-Fix-for-issue-727.patch b/debian/patches/0002-Fix-for-issue-727.patch
index 5b5fcb9..d96a018 100644
--- a/debian/patches/0002-Fix-for-issue-727.patch
+++ b/debian/patches/0002-Fix-for-issue-727.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Sat, 23 Apr 2011 18:39:43 +0200
-Subject: [PATCH] Fix for issue 727
+Subject: Fix for issue 727
 
 ---
  src/kernel/visitor.ml |   26 ++++++++++++++++++--------
diff --git a/debian/patches/0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch b/debian/patches/0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
new file mode 100644
index 0000000..8075f6e
--- /dev/null
+++ b/debian/patches/0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch
@@ -0,0 +1,27 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+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 4c90b5d..77989e0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1215,11 +1215,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/series b/debian/patches/series
index 4757ee4..43a7827 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Value-Analysis-Carbon-patchlevel-1.patch
 0002-Fix-for-issue-727.patch
+0003-Add-ocamlgraph-to-DYN_-O-B-LINKFLAGS.patch

-- 
frama-c packaging