[Pkg-ocaml-maint-commits] [SCM] why packaging branch, master, updated. debian/2.29+dfsg-1-1-g7042c0b

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 7042c0b0ad4136589e1a46bc91e5536b892b2f81
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Apr 25 00:30:47 2011 +0200

    Fix FTBFS on armel.

diff --git a/debian/changelog b/debian/changelog
index be77ad9..0c41d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+why (2.29+dfsg-2) unstable; urgency=low
+
+  * Fix FTBFS on armel.
+    - add 0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 25 Apr 2011 00:29:49 +0200
+
 why (2.29+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch b/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch
index 8e814e7..c662fe6 100644
--- a/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch
+++ b/debian/patches/0001-Why-2.29-do-support-Coq-8.3.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Sat, 23 Apr 2011 20:03:16 +0200
-Subject: [PATCH] Why 2.29 do support Coq 8.3
+Subject: Why 2.29 do support Coq 8.3
 
 ---
  tools/dpConfig.ml |    2 +-
diff --git a/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch b/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch
index 51ed7e2..d3f4192 100644
--- a/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch
+++ b/debian/patches/0002-Mark-alt-ergo-0.93-as-compatible.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Sat, 23 Apr 2011 20:07:20 +0200
-Subject: [PATCH] Mark alt-ergo 0.93 as compatible
+Subject: Mark alt-ergo 0.93 as compatible
 
 ---
  tools/dpConfig.ml |    2 +-
diff --git a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
index 9150718..2b22c73 100644
--- a/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
+++ b/debian/patches/0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
@@ -1,6 +1,6 @@
 From: Mehdi Dogguy <mehdi at debian.org>
 Date: Sat, 23 Apr 2011 20:15:35 +0200
-Subject: [PATCH] Fix non-exhaustive pattern-matching in jc_annot_inference.ml
+Subject: Fix non-exhaustive pattern-matching in jc_annot_inference.ml
 
 ---
  jc/jc_annot_inference.ml |    6 +++---
diff --git a/debian/patches/0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch b/debian/patches/0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch
new file mode 100644
index 0000000..2721f26
--- /dev/null
+++ b/debian/patches/0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Mon, 25 Apr 2011 00:29:35 +0200
+Subject: ocamlgraph is needed to link frama-c-Jessie
+
+---
+ frama-c-plugin/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/frama-c-plugin/Makefile b/frama-c-plugin/Makefile
+index d416b11..e9b30e1 100644
+--- a/frama-c-plugin/Makefile
++++ b/frama-c-plugin/Makefile
+@@ -36,7 +36,7 @@ endif
+ 
+ PLUGIN_DIR      ?= .
+ WHY_DISTRIB	?= $(PLUGIN_DIR)/..
+-JESSIE_INCLUDES	?= -I $(WHY_DISTRIB)/src -I $(WHY_DISTRIB)/jc
++JESSIE_INCLUDES	?= -I $(WHY_DISTRIB)/src -I $(WHY_DISTRIB)/jc -I +ocamlgraph
+ JCCMO		?= $(WHY_DISTRIB)/jc/jc.cmo
+ JCCMX		?= $(JCCMO:.cmo=.cmx)
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c2c574c..794a9ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Why-2.29-do-support-Coq-8.3.patch
 0002-Mark-alt-ergo-0.93-as-compatible.patch
 0003-Fix-non-exhaustive-pattern-matching-in-jc_annot_infe.patch
+0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch

-- 
why packaging