This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch try
in repository why.
commit 827e12e34c4dad3b29ac25431e9e0ae96f0f2fdf
Author: Ralf Treinen <trei...@free.fr>
Date: Tue Mar 15 21:02:16 2016 +0100
refreshed patches edge and bprintf, dropped patch makefile
---
debian/changelog | 8 ++++++--
debian/patches/bprintf | 10 +++++-----
debian/patches/edge | 8 +++++---
debian/patches/makefile | 13 -------------
debian/patches/series | 1 -
5 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ce54dcb..9c8f61e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
-why (2.34-5) UNRELEASED; urgency=medium
+why (2.35-1) UNRELEASED; urgency=medium
+ * New upstream release:
+ - refreshed patches bprintf and edge
+ - dropped patch makefile as ocaml warning options are now set
+ by configure
* debian/watch:
- format version 4
- get link to newest version from the why home page (instead of
trying to read the download/ directory).
- -- Ralf Treinen <trei...@debian.org> Tue, 23 Feb 2016 20:27:56 +0100
+ -- Ralf Treinen <trei...@debian.org> Tue, 15 Mar 2016 20:55:22 +0100
why (2.34-4) unstable; urgency=medium
diff --git a/debian/patches/bprintf b/debian/patches/bprintf
index 8d813b6..14ae4d9 100644
--- a/debian/patches/bprintf
+++ b/debian/patches/bprintf
@@ -1,12 +1,12 @@
Author: Mehdi Dogguy <me...@debian.org>
Description: Stop using deprecated function Format.bprintf
-Index: src/encoding_mono_inst.ml
+Index: why/src/encoding_mono_inst.ml
===================================================================
---- a/src/encoding_mono_inst.ml
-+++ b/src/encoding_mono_inst.ml
-@@ -126,7 +126,8 @@
- | PTexternal (l,id) -> fprintf fmt "%aI%a"
+--- why.orig/src/encoding_mono_inst.ml 2016-03-15 21:00:55.660268995 +0100
++++ why/src/encoding_mono_inst.ml 2016-03-15 21:00:55.656268978 +0100
+@@ -140,7 +140,8 @@
+ | PTexternal (l,id) -> fprintf fmt "%aI%a"
(Pp.print_list (Pp.constant_string "I") aux) l Ident.print id in
let b = Buffer.create 10 in
- Format.bprintf b "%a@?" aux t;
diff --git a/debian/patches/edge b/debian/patches/edge
index 449fc6d..c5c8eb3 100644
--- a/debian/patches/edge
+++ b/debian/patches/edge
@@ -1,6 +1,8 @@
---- a/src/hypotheses_filtering.ml
-+++ b/src/hypotheses_filtering.ml
-@@ -1687,8 +1687,9 @@
+Index: why/src/hypotheses_filtering.ml
+===================================================================
+--- why.orig/src/hypotheses_filtering.ml 2016-03-15 21:07:45.334803613
+0100
++++ why/src/hypotheses_filtering.ml 2016-03-15 21:07:45.334803613 +0100
+@@ -1681,8 +1681,9 @@
module W = struct
type label = PdlGraph.E.label
diff --git a/debian/patches/makefile b/debian/patches/makefile
deleted file mode 100644
index 5469d22..0000000
--- a/debian/patches/makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -64,8 +64,8 @@
- CAMLP4 = @CAMLP4O@
-
- INCLUDES = -I src -I jc -I c -I java -I intf -I tools -I mix -I ml
--BFLAGS = -w Z -warn-error A -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I
+threads @OCAMLGRAPHLIB@
--OFLAGS = -w Z -warn-error A -dtypes $(INCLUDES) @INCLUDEGTK2@ -I +threads
@OCAMLGRAPHLIB@
-+BFLAGS = -w Z -warn-error +a-3 -dtypes -g $(INCLUDES) @INCLUDEGTK2@ -I
+threads @OCAMLGRAPHLIB@
-+OFLAGS = -w Z -warn-error +a-3 -dtypes $(INCLUDES) @INCLUDEGTK2@ -I
+threads @OCAMLGRAPHLIB@
-
- LCFLAGS = -L/usr/lib -L/usr/local/lib/ocaml
-
diff --git a/debian/patches/series b/debian/patches/series
index cc1e7af..07e19fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
atp-versions
bprintf
-makefile
edge
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/why.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
