[Pkg-ocaml-maint-commits] [alt-ergo] 01/02: Port to OCamlgraph 1.8.4 (Closes: #743072)

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository alt-ergo.

commit a257ccfdd039fe57be390e4b9a2747836db7763e
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Mar 30 23:07:28 2014 +0200

    Port to OCamlgraph 1.8.4 (Closes: #743072)
---
 debian/changelog                                   |  7 +++++++
 .../0001-No-need-to-activate-debug-flag.patch      | 15 ++++++++++-----
 debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ef6664..51ba109 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alt-ergo (0.95.2-2) UNRELEASED; urgency=low
+
+  * Port to OCamlgraph 1.8.4 (Closes: #743072)
+    - add 0002-Port-to-OCamlgraph-1.8.4.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 30 Mar 2014 23:05:50 +0200
+
 alt-ergo (0.95.2-1) sid; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0001-No-need-to-activate-debug-flag.patch b/debian/patches/0001-No-need-to-activate-debug-flag.patch
index b991e2b..da2dec0 100644
--- a/debian/patches/0001-No-need-to-activate-debug-flag.patch
+++ b/debian/patches/0001-No-need-to-activate-debug-flag.patch
@@ -2,11 +2,15 @@ From: Mehdi Dogguy <mehdi at debian.org>
 Date: Tue, 1 Jun 2010 20:41:04 +0200
 Subject: No need to activate debug flag
 
-Index: alt-ergo/Makefile.in
-===================================================================
---- alt-ergo.orig/Makefile.in	2013-11-05 14:08:57.000000000 +0100
-+++ alt-ergo/Makefile.in	2013-11-05 14:14:57.000000000 +0100
-@@ -55,7 +55,7 @@
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index abe08ee..6da1c3f 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -55,7 +55,7 @@ LOCAL_INC = -I src/util -I src/structures -I src/theories -I src/instances -I sr
  INCLUDES = @ZARITHLIB@ @OCAMLGRAPHLIB@ @LABLGTK2LIB@ $(LOCAL_INC)
  #for coverage -I /usr/local/lib/ocaml/3.12.1/bisect -pp "camlp4o str.cma /usr/local/lib/ocaml/3.12.1/bisect/bisect_pp.cmo"
  
@@ -15,3 +19,4 @@ Index: alt-ergo/Makefile.in
  OFLAGS = -annot -inline 1000 $(INCLUDES) -for-pack AltErgo
  
  BIBBYTE = zarith.cma nums.cma graph.cma unix.cma
+-- 
diff --git a/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch b/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch
new file mode 100644
index 0000000..92ce625
--- /dev/null
+++ b/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 30 Mar 2014 23:05:31 +0200
+Subject: Port to OCamlgraph 1.8.4
+
+---
+ src/preprocess/pruning.ml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/preprocess/pruning.ml b/src/preprocess/pruning.ml
+index b372e64..360d2ac 100644
+--- a/src/preprocess/pruning.ml
++++ b/src/preprocess/pruning.ml
+@@ -61,7 +61,7 @@ module PrintG = Graph.Graphviz.Dot
+     let graph_attributes g = (!graph_attrs g)
+     let default_vertex_attributes g = []
+     let vertex_name v = HS.view v
+-    let vertex_attributes v = `Style(`Filled)::(!vertex_attrs v)
++    let vertex_attributes v = (`Style[`Filled])::(!vertex_attrs v)
+     let get_subgraph v = None
+     let default_edge_attributes g = []
+     let edge_attributes e = `Label(E.label e)::(!edge_attrs e)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 605b2ad..628ae98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-No-need-to-activate-debug-flag.patch
+0002-Port-to-OCamlgraph-1.8.4.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/alt-ergo.git