[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20081201.dfsg-3-21-geaf3830

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 289dc895c77ef04cb2abf9dca591902a977681a5
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Aug 28 08:46:39 2009 +0200

    Add a patch to fix linking order for bin/viewer

diff --git a/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch b/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
new file mode 100644
index 0000000..1df3e41
--- /dev/null
+++ b/debian/patches/0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
@@ -0,0 +1,24 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Fri, 28 Aug 2009 08:43:22 +0200
+Subject: [PATCH] Do not add $(GRAPH_GUICMO) to $(BYTE_GUI_LIBS)
+
+Otherwise, they will appear before lablgtk.cma and lablgnomecanvas.cma
+when linking which are needed by viewGraph.cmo (and al.).
+---
+ Makefile.in |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index fbf5f4d..2e0f6b3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -358,8 +358,6 @@ GRAPH_GUICMO=$(GRAPH_GUICMO_BASE:%=$(OCAMLGRAPH_HOME)/%)
+ GRAPH_GUICMX= $(GRAPH_GUICMO:.cmo=.cmx)
+ GRAPH_GUIO= $(GRAPH_GUICMO:.cmo=.o)
+ HAS_VIEWGRAPH=yes
+-BYTE_GUI_LIBS+= $(GRAPH_GUICMO)
+-OPT_GUI_LIBS+= $(GRAPH_GUICMX)
+ endif
+ endif
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index fc6ed5b..82bdf03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0006-Do-not-install-non-existant-files.patch
+0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch

-- 
frama-c packaging