From 63a5cbf4c16eabb87b7045ace4c0e3fde3108b6e Mon Sep 17 00:00:00 2001
From: Julien Signoles <julien.signoles@cea.fr>
Date: Wed, 17 Apr 2013 12:13:22 +0000
Subject: [PATCH] Ready for release 1.8.3

---
 CHANGES       |  2 ++
 Makefile.in   |  2 +-
 src/merge.ml  | 10 +++++-----
 src/merge.mli |  6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 44132c38..5a8db641 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 
+version 1.8.3, April 17, 2013
+---------------------------
  o new module Merge implementing several different of merges of vertices and
    edges into a graph (contributed by Emmanuel Haucourt)
  o fixed DOT parser (contributed by Alex Reece)
diff --git a/Makefile.in b/Makefile.in
index c81841a0..1b32d457 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,7 +106,7 @@ graph.cmo: $(CMI) $(CMO)
 graph.cmx: $(CMI) $(CMX)
 	$(OCAMLOPT) $(INCLUDES) -pack -o $@ $^
 
-VERSION=1.8.2+svn
+VERSION=1.8.3
 
 src/version.ml: Makefile
 	rm -f $@
diff --git a/src/merge.ml b/src/merge.ml
index 5f7224a6..c8581e36 100644
--- a/src/merge.ml
+++ b/src/merge.ml
@@ -34,7 +34,7 @@ module type S = sig
     graph
 end
 
-module B(B: Graph.Builder.S) = struct
+module B(B: Builder.S) = struct
     
   type graph = B.G.t
   type vertex = B.G.vertex
@@ -176,7 +176,7 @@ module B(B: Graph.Builder.S) = struct
     merge_vertex g to_be_merged
 
   let merge_scc ?(loop_killer=false) ?specified_vertex g =
-    let module C = Graph.Components.Make(B.G) in
+    let module C = Components.Make(B.G) in
     let components = C.scc_list g in
     let alter accu to_be_identified =
       let to_be_identified =
@@ -192,10 +192,10 @@ module B(B: Graph.Builder.S) = struct
       
 end
 
-module P(G: Graph.Sig.P) = B(Graph.Builder.P(G))
+module P(G: Sig.P) = B(Builder.P(G))
 
-module I(G: Graph.Sig.I) = struct
-  include B(Graph.Builder.I(G))
+module I(G: Sig.I) = struct
+  include B(Builder.I(G))
   let merge_vertex g vl = ignore (merge_vertex g vl)
   let merge_edges_e ?src ?dst g el = ignore (merge_edges_e ?src ?dst g el)
   let merge_edges_with_label ?src ?dst ?label g l =
diff --git a/src/merge.mli b/src/merge.mli
index 6be23c31..3b134136 100644
--- a/src/merge.mli
+++ b/src/merge.mli
@@ -99,19 +99,19 @@ module type S = sig
 end
 
 (** Extension for the module [X].*)
-module B(X: Graph.Builder.S) : S with type graph = X.G.t
+module B(X: Builder.S) : S with type graph = X.G.t
 			   and type vertex := X.G.vertex
 			   and type edge := X.G.edge
 			   and type edge_label = X.G.E.label
 
 (**Extension for the module [G].*)
-module P(G: Graph.Sig.P): S with type graph = G.t
+module P(G: Sig.P): S with type graph = G.t
 		      and type vertex := G.vertex
 		      and type edge := G.edge
 		      and type edge_label = G.E.label
 
 (**Extension for the module [G].*)
-module I(G: Graph.Sig.I): sig
+module I(G: Sig.I): sig
 
   (** Same specification than module type {!S} but modify the graph inplace
       instead of returning a new graph. *)