[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20081201.dfsg-3-21-geaf3830
Mehdi Dogguy
mehdi at debian.org
Fri Aug 28 11:23:43 UTC 2009
The following commit has been merged in the master branch:
commit 6cf2a4925873042bbaedbb41088d0ae25411a0a5
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Fri Aug 28 12:17:59 2009 +0200
Remove-patches-now-integrated-upstream
diff --git a/debian/patches/0001-Gui_includes-variable-should-include-ocamlgraph-too.patch b/debian/patches/0001-Gui_includes-variable-should-include-ocamlgraph-too.patch
deleted file mode 100644
index 3d71db2..0000000
--- a/debian/patches/0001-Gui_includes-variable-should-include-ocamlgraph-too.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 11:46:46 +0200
-Subject: [PATCH] Gui_includes variable should include ocamlgraph too
-
----
- Makefile.in | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 536d659..30f9e19 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1204,7 +1204,7 @@ why:
-
- GEN_BYTE_LIBS+=@JCCMO@
- GEN_OPT_LIBS+=@JCCMX@
--else ifeq (@ENABLE_JESSIE@,yes)
-+else ifneq (@ENABLE_JESSIE@,no)
- BYTE_LIBS+=@JCCMO@
- OPT_LIBS+=@JCCMX@
- endif
-@@ -1556,6 +1556,9 @@ bin/toplevel.top$(EXE): $(ALL_CMO) src/toplevel/toplevel_topdirs.cmo \
-
- ifneq (@ENABLE_GUI@,no)
- GUI_INCLUDES = -I src/gui -I +lablgtk2
-+ifeq ("$(OCAMLGRAPH_LOCAL)","")
-+GUI_INCLUDES += $(OCAMLGRAPH)
-+endif
- BYTE_GUI_LIBS+= lablgtk.cma
- OPT_GUI_LIBS += lablgtk.cmxa
-
---
diff --git a/debian/patches/0002-Make-the-jessie-plugin-compatible-with-why-2.18.patch b/debian/patches/0002-Make-the-jessie-plugin-compatible-with-why-2.18.patch
deleted file mode 100644
index 106614f..0000000
--- a/debian/patches/0002-Make-the-jessie-plugin-compatible-with-why-2.18.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 13:44:09 +0200
-Subject: [PATCH] Make the jessie plugin compatible with why 2.18
-
----
- src/jessie/interp.ml | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/jessie/interp.ml b/src/jessie/interp.ml
-index a5ef6dc..fb86327 100644
---- a/src/jessie/interp.ml
-+++ b/src/jessie/interp.ml
-@@ -1976,7 +1976,7 @@ let global vardefs g =
- let kf = Globals.Functions.get v in
- let funspec = Kernel_function.get_spec kf in
- let params = Globals.Functions.get_params kf in
-- let formal v = ctype v.vtype, unique_name_if_empty v.vname in
-+ let formal v = true, ctype v.vtype, unique_name_if_empty v.vname in
- let formals = List.map formal params in
- [JCDfun(ctype rtyp,id,formals,spec funspec,None)]
- else
-@@ -2001,7 +2001,7 @@ let global vardefs g =
- | TFun(ty,_,_,_) -> ty
- | _ -> assert false
- in
-- let formal v = ctype v.vtype, v.vname in
-+ let formal v = true, ctype v.vtype, v.vname in
- let formals = List.map formal f.sformals in
- let id = mkidentifier f.svar.vname f.svar.vdecl in
- let funspec =
---
diff --git a/debian/patches/0003-Correctly-detect-jessie-plugin.patch b/debian/patches/0003-Correctly-detect-jessie-plugin.patch
deleted file mode 100644
index 1612c10..0000000
--- a/debian/patches/0003-Correctly-detect-jessie-plugin.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 14:16:32 +0200
-Subject: [PATCH] Correctly detect jessie plugin
-
----
- configure | 8 ++++----
- configure.in | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index 54a40f7..45df560 100755
---- a/configure
-+++ b/configure
-@@ -7608,11 +7608,11 @@ if test "$HAS_WHYJC" == "yes" -a "$REQUIRE_WHYJC" != ""; then
- INFO_JESSIE=" (configuration of Why failed)"
- fi
- ;;
-- $OCAMLLIB/jessie)
-- JCCMO=$SELECTED_WHYJC/jc.cmo
-- JCCMX=$SELECTED_WHYJC/jc.cmx
-+ $OCAMLLIB/jessie/*)
-+ JCCMO=$OCAMLLIB/jessie/jc.cmo
-+ JCCMX=$OCAMLLIB/jessie/jc.cmx
- JESSIE_LOCAL=no
-- JESSIE_INCLUDES="-I $SELECTED_WHYJC"
-+ JESSIE_INCLUDES="-I +jessie"
- ;;
- *)
- { echo "$as_me:$LINENO: WARNING: Unexpected location for why tool: $SELECTED_WHYJC" >&5
-diff --git a/configure.in b/configure.in
-index 611dcd9..7281e40 100644
---- a/configure.in
-+++ b/configure.in
-@@ -936,11 +936,11 @@ if test "$HAS_WHYJC" == "yes" -a "$REQUIRE_WHYJC" != ""; then
- INFO_JESSIE=" (configuration of Why failed)"
- fi
- ;;
-- $OCAMLLIB/jessie)
-- JCCMO=$SELECTED_WHYJC/jc.cmo
-- JCCMX=$SELECTED_WHYJC/jc.cmx
-+ $OCAMLLIB/jessie/*)
-+ JCCMO=$OCAMLLIB/jessie/jc.cmo
-+ JCCMX=$OCAMLLIB/jessie/jc.cmx
- JESSIE_LOCAL=no
-- JESSIE_INCLUDES="-I $SELECTED_WHYJC"
-+ JESSIE_INCLUDES="-I +jessie"
- ;;
- *)
- AC_MSG_WARN([Unexpected location for why tool: $SELECTED_WHYJC])
---
diff --git a/debian/patches/0004-Using-graph.cm-a-xa-instead-of-graph.cm-o-x.patch b/debian/patches/0004-Using-graph.cm-a-xa-instead-of-graph.cm-o-x.patch
deleted file mode 100644
index 3fd7fb8..0000000
--- a/debian/patches/0004-Using-graph.cm-a-xa-instead-of-graph.cm-o-x.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 16:23:54 +0200
-Subject: [PATCH] Using graph.cm{a,xa} instead of graph.cm{o,x}
-
----
- Makefile.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 30f9e19..c46717b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -409,8 +409,8 @@ untar-ocamlgraph: ocamlgraph.tar.gz
- else # does not use ocamlgraph local version
-
- INCLUDES+=$(OCAMLGRAPH)
--GRAPH_BYTE=graph.cmo
--GRAPH_OPT=graph.cmx
-+GRAPH_BYTE=graph.cma
-+GRAPH_OPT=graph.cmxa
-
- # viewgraph (included in ocamlgraph)
- ifeq ($(HAS_GNOMECANVAS),yes)
---
diff --git a/debian/patches/0005-Full-path-for-ocamlgraph-cmo-otherwise-Makefile-will.patch b/debian/patches/0005-Full-path-for-ocamlgraph-cmo-otherwise-Makefile-will.patch
deleted file mode 100644
index 1de0d3d..0000000
--- a/debian/patches/0005-Full-path-for-ocamlgraph-cmo-otherwise-Makefile-will.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
-Date: Tue, 12 May 2009 17:11:43 +0200
-Subject: [PATCH] Full path for ocamlgraph cmo otherwise Makefile will try to create them
-
----
- Makefile.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index c46717b..80a7bee 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -415,7 +415,7 @@ GRAPH_OPT=graph.cmxa
- # viewgraph (included in ocamlgraph)
- ifeq ($(HAS_GNOMECANVAS),yes)
- ifeq (@ENABLE_SYNTACTIC_CALLGRAPH@,yes)
--GRAPH_GUICMO= viewGraph.cmo viewGraph_select.cmo
-+GRAPH_GUICMO= $(OCAMLLIB)/ocamlgraph/viewGraph.cmo $(OCAMLLIB)/ocamlgraph/viewGraph_select.cmo
- GRAPH_GUICMX= $(GRAPH_GUICMO:.cmo=.cmx)
- HAS_VIEWGRAPH=yes
- endif
---
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
deleted file mode 100644
index a8474e4..0000000
--- a/debian/patches/0007-Add-a-variable-for-ENABLE_GUI-in-Makefile.in.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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/series b/debian/patches/series
index b387473..fc6ed5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
-0001-Gui_includes-variable-should-include-ocamlgraph-too.patch
-0002-Make-the-jessie-plugin-compatible-with-why-2.18.patch
-0003-Correctly-detect-jessie-plugin.patch
-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
More information about the Pkg-ocaml-maint-commits
mailing list