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

[Mehdi Dogguy]

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

    FTBFS problem fixed in Frama-C

diff --git a/debian/changelog b/debian/changelog
index 0c41d07..b573eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+why (2.29+dfsg-3) unstable; urgency=low
+
+  * Remove last added patch. The problem was in Makefile.dynamic, shipped
+    by frama-c-base which lacks some include statements.
+    - remove 0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch
+    - Bump minimum version number for Frama-C to 20110201+carbon+dfsg-2~.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Mon, 25 Apr 2011 12:11:03 +0200
+
 why (2.29+dfsg-2) unstable; urgency=low
 
   * Fix FTBFS on armel.
diff --git a/debian/control b/debian/control
index 294ddb8..bf9d45c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
   liblablgtk2-ocaml-dev (>= 2.12.0-3~),
   coq (>= 8.3~),
   libocamlgraph-ocaml-dev (>= 1.4~),
-  frama-c-base (>= 20110201+carbon+dfsg-1~),
+  frama-c-base (>= 20110201+carbon+dfsg-2~),
   libapron-ocaml-dev (>= 0.9.10-4~),
   camlidl
 Standards-Version: 3.9.0
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
deleted file mode 100644
index 2721f26..0000000
--- a/debian/patches/0004-ocamlgraph-is-needed-to-link-frama-c-Jessie.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 794a9ad..c2c574c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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