This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository alt-ergo.
commit 1ae21bb2ce895fcf06ec20f7dac009cfbd3a94b9
Author: Ralf Treinen <trei...@free.fr>
Date: Tue Nov 29 21:35:27 2016 +0100
new upstream version
---
debian/changelog | 9 +++++++--
debian/control | 2 ++
debian/patches/0001-dont-activate-debug-flag | 16 +++++++++-------
debian/patches/0002-non-free-dropped | 16 ++++++++--------
debian/patches/0003-allow-set-build-date | 6 +++---
5 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f89fcd5..2b77c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-alt-ergo (1.01-2) unstable; urgency=medium
+alt-ergo (1.30-1) unstable; urgency=medium
+ * new upstream version:
+ - refreshed patch 0001-dont-activate-debug-flags
+ - refreshed patch 0002-non-free-dropped
+ - refreshed patch 0003-allow-set-build-date
+ - added build-dependency on ocplib-simplex-ocaml-dev and libzip-ocaml-dev
* debhelper compatibility level 10:
- bumped build-dependency on debhelper
- bumped value in debian/compat
@@ -8,7 +13,7 @@ alt-ergo (1.01-2) unstable; urgency=medium
* debian/control: dropped redundant Testsuite
* updated Vcs-{Git,Browser}
- -- Ralf Treinen <trei...@debian.org> Wed, 26 Oct 2016 21:20:46 +0200
+ -- Ralf Treinen <trei...@debian.org> Mon, 12 Dec 2016 19:27:46 +0100
alt-ergo (1.01-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index fcdace6..41b5aeb 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Build-Depends:
liblablgtk2-gnome-ocaml-dev (>= 2.14.0+dfsg-2~),
liblablgtksourceview2-ocaml-dev (>= 2.14.0+dfsg-2~),
libzarith-ocaml-dev,
+ libzip-ocaml-dev,
+ ocplib-simplex-ocaml-dev,
dh-ocaml (>= 0.9.0~)
Homepage: http://alt-ergo.lri.fr
Standards-Version: 3.9.8
diff --git a/debian/patches/0001-dont-activate-debug-flag
b/debian/patches/0001-dont-activate-debug-flag
index 5b789e1..0ac92fc 100644
--- a/debian/patches/0001-dont-activate-debug-flag
+++ b/debian/patches/0001-dont-activate-debug-flag
@@ -4,14 +4,16 @@ Subject: No need to activate debug flag
Index: alt-ergo/Makefile.users
===================================================================
---- alt-ergo.orig/Makefile.users 2016-02-28 20:16:07.051631675 +0100
-+++ alt-ergo/Makefile.users 2016-02-28 20:16:07.047631662 +0100
-@@ -10,7 +10,7 @@
- INCLUDES = $(ZARITHLIB) $(OCAMLGRAPHLIB) $(LABLGTK2LIB) $(LOCAL_INC)
+--- alt-ergo.orig/Makefile.users 2016-11-29 21:30:02.550935423 +0100
++++ alt-ergo/Makefile.users 2016-11-29 21:30:22.759016581 +0100
+@@ -10,8 +10,8 @@
+ INCLUDES = $(ZARITHLIB) $(LABLGTK2LIB) $(CAMLZIPLIB) $(OCPLIBSIMPLEXLIB)
$(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"
--BFLAGS = -annot -g $(INCLUDES)
-+BFLAGS = -annot $(INCLUDES)
- OFLAGS = -annot -inline 100 $(INCLUDES)
+-BFLAGS = -annot -absname -bin-annot -short-paths -strict-sequence -g
$(INCLUDES)
+-OFLAGS = -annot -absname -bin-annot -short-paths -strict-sequence -g -inline
100 $(INCLUDES)
++BFLAGS = -annot -absname -bin-annot -short-paths -strict-sequence $(INCLUDES)
++OFLAGS = -annot -absname -bin-annot -short-paths -strict-sequence -inline 100
$(INCLUDES)
# -for-pack AltErgo
+ BIBBYTE = zarith.cma nums.cma unix.cma dynlink.cma str.cma zip.cma
ocplibSimplex.cma
diff --git a/debian/patches/0002-non-free-dropped
b/debian/patches/0002-non-free-dropped
index 3514ede..f44e034 100644
--- a/debian/patches/0002-non-free-dropped
+++ b/debian/patches/0002-non-free-dropped
@@ -3,8 +3,8 @@ Description: adapt Makefile to the removal of the non-free
directory
Index: alt-ergo/Makefile.users
===================================================================
---- alt-ergo.orig/Makefile.users 2016-02-28 20:18:15.144054395 +0100
-+++ alt-ergo/Makefile.users 2016-02-28 20:21:15.712655282 +0100
+--- alt-ergo.orig/Makefile.users 2016-11-29 21:31:31.135291477 +0100
++++ alt-ergo/Makefile.users 2016-11-29 21:31:31.131291461 +0100
@@ -4,8 +4,6 @@
LOCAL_INC = -I src/util -I src/structures -I src/theories -I src/instances \
@@ -12,9 +12,9 @@ Index: alt-ergo/Makefile.users
- -I non-free/plugins/common -I non-free/plugins/satML -I
non-free/plugins/profiler \
- -I non-free/plugins/fm-simplex
- INCLUDES = $(ZARITHLIB) $(OCAMLGRAPHLIB) $(LABLGTK2LIB) $(LOCAL_INC)
+ INCLUDES = $(ZARITHLIB) $(LABLGTK2LIB) $(CAMLZIPLIB) $(OCPLIBSIMPLEXLIB)
$(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"
-@@ -242,7 +240,7 @@
+@@ -247,7 +245,7 @@
#######
clean:
@@ -23,7 +23,7 @@ Index: alt-ergo/Makefile.users
rm -f $$dd/*.cm[ioxtp] $$dd/*.cmti $$dd/*.o $$dd/*~ $$dd/*.annot
$$dd/*.owz;\
rm -f $(GENERATED) $$dd/*.output META ; \
rm -f $(NAME).byte $(NAME).opt $(GUINAME).opt $(GUINAME).byte *~; \
-@@ -254,11 +252,11 @@
+@@ -259,11 +257,11 @@
########
.depend depend: $(GENERATED)
@@ -37,7 +37,7 @@ Index: alt-ergo/Makefile.users
ifeq ($(OCAMLBEST),opt)
cae: ctrl-alt-ergo.opt
-@@ -266,21 +264,11 @@
+@@ -271,21 +269,11 @@
cae: ctrl-alt-ergo.byte
endif
@@ -59,7 +59,7 @@ Index: alt-ergo/Makefile.users
SATML-CMX = $(SATML-CMO:.cmo=.cmx)
satML-plugin.cmxs: $(CMX) $(SATML-CMX)
-@@ -305,11 +293,6 @@
+@@ -310,11 +298,6 @@
endif
@@ -71,7 +71,7 @@ Index: alt-ergo/Makefile.users
FM-SIMPLEX-CMX = $(FM-SIMPLEX-CMO:.cmo=.cmx)
fm-simplex-plugin.cmxs: $(CMX) $(FM-SIMPLEX-CMX)
-@@ -334,12 +317,6 @@
+@@ -339,12 +322,6 @@
endif
diff --git a/debian/patches/0003-allow-set-build-date
b/debian/patches/0003-allow-set-build-date
index 3d019fc..8f08913 100644
--- a/debian/patches/0003-allow-set-build-date
+++ b/debian/patches/0003-allow-set-build-date
@@ -7,15 +7,15 @@ Last-Update: 2015-05-25
---
Index: alt-ergo/Makefile.users
===================================================================
---- alt-ergo.orig/Makefile.users 2016-02-28 20:22:21.608875706 +0100
-+++ alt-ergo/Makefile.users 2016-02-28 20:24:24.277287302 +0100
+--- alt-ergo.orig/Makefile.users 2016-11-29 21:32:45.203589705 +0100
++++ alt-ergo/Makefile.users 2016-11-29 21:32:45.199589689 +0100
@@ -1,4 +1,5 @@
ARCH = $(shell uname -m)
+BUILD_DATE ?= $(shell LANG=C date)
VERSION=$(shell grep "=" src/util/version.ml | cut -d"=" -f2 | head -n 1)
-@@ -153,7 +154,7 @@
+@@ -158,7 +159,7 @@
.PHONY: gui
src/util/config.ml: config.status
--
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
