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

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

commit 7d41a30ac8632117874d4c235b5434f668e5778c
Author: Mehdi Dogguy <me...@debian.org>
Date:   Sun Apr 27 11:21:03 2014 +0200

    Revert "Port to OCamlgraph 1.8.4 (Closes: #743072)"
    
    This reverts commit a257ccfdd039fe57be390e4b9a2747836db7763e.
    
    Conflicts:
        debian/changelog
---
 debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch | 22 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 23 deletions(-)

diff --git a/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch 
b/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch
deleted file mode 100644
index 92ce625..0000000
--- a/debian/patches/0002-Port-to-OCamlgraph-1.8.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <me...@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 628ae98..605b2ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to