[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20100401+boron+dfsg-1-3-g2921277

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0df585f3dedf6b18282c30e7ed50d8da327b5f7a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Jun 1 20:02:44 2010 +0200

    Make the configure script accept OCamlgraph 1.5 (Closes: #580090)

diff --git a/debian/changelog b/debian/changelog
index 06423b3..a2342e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+frama-c (20100401+boron+dfsg-2) unstable; urgency=low
+
+  * Make the configure script accept OCamlgraph 1.5 (Closes: #580090)
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 01 Jun 2010 20:00:08 +0200
+
 frama-c (20100401+boron+dfsg-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/debian/patches/0006-OCamlgraph-1.5-is-compatible.patch b/debian/patches/0006-OCamlgraph-1.5-is-compatible.patch
new file mode 100644
index 0000000..db766e2
--- /dev/null
+++ b/debian/patches/0006-OCamlgraph-1.5-is-compatible.patch
@@ -0,0 +1,35 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 1 Jun 2010 19:59:56 +0200
+Subject: [PATCH] OCamlgraph 1.5 is compatible
+
+---
+ configure    |    2 ++
+ configure.in |    1 +
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure b/configure
+index 6c0a567..b87ee33 100755
+--- a/configure
++++ b/configure
+@@ -3121,6 +3121,8 @@ if test "$OCAMLGRAPH_EXISTS" = "yes"; then
+   case $OCAMLGRAPH_VERSION in
+   1.4) { $as_echo "$as_me:${as_lineno-$LINENO}: ocamlgraph $OCAMLGRAPH_VERSION found" >&5
+ $as_echo "$as_me: ocamlgraph $OCAMLGRAPH_VERSION found" >&6;};;
++  1.5) { $as_echo "$as_me:${as_lineno-$LINENO}: ocamlgraph $OCAMLGRAPH_VERSION found" >&5
++$as_echo "$as_me: ocamlgraph $OCAMLGRAPH_VERSION found" >&6;};;
+   *) { $as_echo "$as_me:${as_lineno-$LINENO}: ocamlgraph $OCAMLGRAPH_VERSION is incompatible with Frama-C. Will switch to a local version." >&5
+ $as_echo "$as_me: ocamlgraph $OCAMLGRAPH_VERSION is incompatible with Frama-C. Will switch to a local version." >&6;}
+      OCAMLGRAPH_EXISTS=no
+diff --git a/configure.in b/configure.in
+index d4b7db8..2e42e48 100644
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,7 @@ if test "$OCAMLGRAPH_EXISTS" = "yes"; then
+   OCAMLGRAPH_VERSION=`./test_ocamlgraph`
+   case $OCAMLGRAPH_VERSION in
+   1.4) AC_MSG_NOTICE([ocamlgraph $OCAMLGRAPH_VERSION found]);;
++  1.5) AC_MSG_NOTICE([ocamlgraph $OCAMLGRAPH_VERSION found]);;
+   *) AC_MSG_NOTICE([ocamlgraph $OCAMLGRAPH_VERSION is incompatible with Frama-C. Will switch to a local version.])
+      OCAMLGRAPH_EXISTS=no
+ ;;
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index be7dfc7..190d744 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Fix-build-on-bytecode-only-architectures.patch
 0004-Fix-some-typos.patch
 0005-Don-t-modify-system-files.patch
+0006-OCamlgraph-1.5-is-compatible.patch

-- 
frama-c packaging