[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20081201.dfsg-1-6-g8e9101e

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 8e9101e8f27987821e19ce3dee826e922d269616
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Wed Jun 3 13:38:25 2009 +0200

    Remove useless patch and add patch to enable_gui in Makefile.in

diff --git a/debian/patches/0007-Add-a-variable-for-ENABLE_GUI-in-Makefile.in.patch b/debian/patches/0007-Add-a-variable-for-ENABLE_GUI-in-Makefile.in.patch
new file mode 100644
index 0000000..a8474e4
--- /dev/null
+++ b/debian/patches/0007-Add-a-variable-for-ENABLE_GUI-in-Makefile.in.patch
@@ -0,0 +1,30 @@
+From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Date: Wed, 3 Jun 2009 13:36:45 +0200
+Subject: [PATCH] Add a variable for ENABLE_GUI in Makefile.in
+
+---
+ Makefile.in |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9e2aa76..dfc77e9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -73,6 +73,7 @@ HAS_GTKSOURCEVIEW=@HAS_GTKSOURCEVIEW@
+ HAS_GNOMECANVAS=@HAS_GNOMECANVAS@
+ HAS_LEGACY_GTKSOURCEVIEW=@HAS_LEGACY_GTKSOURCEVIEW@
+ HAS_LABLGTK_CUSTOM_MODEL=@HAS_LABLGTK_CUSTOM_MODEL@
++ENABLE_GUI=@ENABLE_GUI@
+ OTAGS	= @OTAGS@
+ DOT	= @DOT@
+ 
+@@ -1554,7 +1555,7 @@ bin/toplevel.top$(EXE): $(ALL_CMO) src/toplevel/toplevel_topdirs.cmo \
+ # GUI #
+ #######
+ 
+-ifneq (@ENABLE_GUI@,no)
++ifneq ($(ENABLE_GUI),no)
+ GUI_INCLUDES = -I src/gui -I +lablgtk2
+ ifeq ("$(OCAMLGRAPH_LOCAL)","")
+ GUI_INCLUDES += $(OCAMLGRAPH)
+-- 
diff --git a/debian/patches/0007-Ergo-is-Alt-ergo.patch b/debian/patches/0007-Ergo-is-Alt-ergo.patch
deleted file mode 100644
index e1a3e81..0000000
--- a/debian/patches/0007-Ergo-is-Alt-ergo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Wed, 20 May 2009 16:15:09 +0200
-Subject: [PATCH] Ergo is Alt-ergo
-
----
- src/logic/why_output.ml |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/logic/why_output.ml b/src/logic/why_output.ml
-index 92af1ad..18fa12d 100644
---- a/src/logic/why_output.ml
-+++ b/src/logic/why_output.ml
-@@ -151,9 +151,9 @@ let prove basename prelude p =
-           else begin
-             let base = Filename.chop_extension why_file in
-             let ergo_file = (base^"_why.why") in
--              Format.printf "[?] call 'ergo' on %s at ." ergo_file;
--              if Sys.command (sprintf "ergo %s" ergo_file) <> 0 then
--                Format.printf "Could not run ergo. at ."
-+              Format.printf "[?] call 'alt-ergo' on %s at ." ergo_file;
-+              if Sys.command (sprintf "alt-ergo %s" ergo_file) <> 0 then
-+                Format.printf "Could not run alt-ergo. at ."
-           end
-       end
-     else
--- 
diff --git a/debian/patches/series b/debian/patches/series
index cf75bc6..b387473 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Using-graph.cm-a-xa-instead-of-graph.cm-o-x.patch
 0005-Full-path-for-ocamlgraph-cmo-otherwise-Makefile-will.patch
 0006-Do-not-install-non-existant-files.patch
+0007-Add-a-variable-for-ENABLE_GUI-in-Makefile.in.patch

-- 
frama-c packaging