[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090901+beryllium+dfsg-2-13-g9f4d396

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 0f0627dd35f777839f02a99a80fc7eec692c28fb
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 10 16:30:08 2010 +0100

    Remove 0003-Add-dGraphView.cmo-when-linking.patch (fixed upstream)

diff --git a/debian/changelog b/debian/changelog
index 24970c0..e20d3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ frama-c (20090902+beryllium+dfsg-1) UNRELEASED; urgency=low
   * New upstream release
     + Remove 0001-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
       (fixed upstream)
+    + Remove 0003-Add-dGraphView.cmo-when-linking.patch (fixed upstream)
   * Update copyright file
   * Remove libjessie-ocaml-dev from build-deps (Why is not needed anymore
     to build Frama-C).
diff --git a/debian/patches/0003-Add-dGraphView.cmo-when-linking.patch b/debian/patches/0003-Add-dGraphView.cmo-when-linking.patch
deleted file mode 100644
index 518aada..0000000
--- a/debian/patches/0003-Add-dGraphView.cmo-when-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Wed, 9 Sep 2009 17:25:18 +0200
-Subject: [PATCH] Add dGraphView.cmo when linking
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 65d9f77..3a70533 100644
---- a/Makefile
-+++ b/Makefile
-@@ -357,7 +357,7 @@ OPT_LIBS+= graph.cmxa
- ifeq ($(HAS_GNOMECANVAS),yes)
- ifeq ($(ENABLE_SYNTACTIC_CALLGRAPH),yes)
- GRAPH_GUICMO_BASE= xDotDraw.cmo dGraphModel.cmo xDot.cmo dGraphViewItem.cmo \
--	concreteModel.cmo
-+	dGraphView.cmo concreteModel.cmo
- GRAPH_GUICMO_BASE+= viewGraph.cmo viewGraph_select.cmo viewGraph_utils.cmo
- GRAPH_GUICMO=$(GRAPH_GUICMO_BASE:%=$(OCAMLGRAPH_HOME)/%)
- GRAPH_GUICMX= $(GRAPH_GUICMO:.cmo=.cmx)
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 9d1b6fa..06192d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0003-Add-dGraphView.cmo-when-linking.patch
 0004-Use-GSourceView2.patch

-- 
frama-c packaging