This is an automated email from the git hooks/post-receive script.
hendrik-guest pushed a commit to branch master
in repository otags.
commit 475812baa95682d2541385b82126fefa62cf8d37
Author: Hendrik Tews <hend...@askra.de>
Date: Sun Jan 1 00:43:05 2017 +0100
build and test without libsexplib-camlp4-dev
---
debian/changelog | 7 ++
debian/control | 3 +-
debian/patches/disable-sexplib-tests.patch | 102 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 111 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5d9e224..c445272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+otags (4.02.2-2) unstable; urgency=medium
+
+ * drop libsexplib-camlp4-dev from build dependencies (Closes: 843319)
+ * add patch disable-sexplib-tests to disable the sexplib tests
+
+ -- Hendrik Tews <hend...@askra.de> Sun, 01 Jan 2017 00:37:56 +0100
+
otags (4.02.2-1) unstable; urgency=medium
* New uptream release (Closes: #802166)
diff --git a/debian/control b/debian/control
index caa127c..9bea605 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Build-Depends:
debhelper (>= 9),
dh-ocaml (>= 0.9~),
camlp4 (>= 4.02),
- cppo,
- libsexplib-camlp4-dev
+ cppo
Standards-Version: 3.9.5
Homepage: http://askra.de/software/otags/
Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/otags.git
diff --git a/debian/patches/disable-sexplib-tests.patch
b/debian/patches/disable-sexplib-tests.patch
new file mode 100644
index 0000000..874c144
--- /dev/null
+++ b/debian/patches/disable-sexplib-tests.patch
@@ -0,0 +1,102 @@
+Description: disable tests with libsexplib
+Author: Hendrik Tews <hend...@askra.de>
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -227,9 +227,9 @@
+ TESTSOURCES_MLI:= test/c.mli test/e.mli
+ TESTSOURCES_NORM:= $(TESTSOURCES_ML) $(TESTSOURCES_MLI)
+ TESTSOURCES_EXT:= test/cpp_i.generated.ml test/cppo_i.generated.ml
+-TESTSOURCES_SEXP_ML:= test/f.ml
+-TESTSOURCES_SEXP_MLI:= test/g.mli
+-TESTSOURCES_SEXP:= $(TESTSOURCES_SEXP_MLI) $(TESTSOURCES_SEXP_ML)
++#TESTSOURCES_SEXP_ML:= test/f.ml
++#TESTSOURCES_SEXP_MLI:= test/g.mli
++#TESTSOURCES_SEXP:= $(TESTSOURCES_SEXP_MLI) $(TESTSOURCES_SEXP_ML)
+ TESTSOURCES:= $(TESTSOURCES_NORM) $(TESTSOURCES_SEXP) $(TESTSOURCES_EXT)
+ COMPILEDTESTS:= $(TESTSOURCES_MLI:.mli=.cmi) \
+ $(TESTSOURCES_ML:.ml=.cmo) \
+@@ -240,16 +240,14 @@
+
+ test/test.NEWTAGS: otags-binaries $(TESTSOURCES)
+ $(MAKE) OCAMLFLAGS="-w a" $(COMPILEDTESTS)
+- ./otags -I $(TYPECONVDIR) -I $(SEXPLIBDIR) \
+- -pa pa_type_conv.cma -pa pa_sexp_conv.cma $(TESTSOURCES_SEXP) \
++ ./otags \
+ -pr $(TESTSOURCES_NORM) \
+ -extern $(TESTSOURCES_EXT) \
+ -o test/test.NEWTAGS
+
+ test/test.newtags: otags-binaries $(TESTSOURCES)
+ $(MAKE) OCAMLFLAGS="-w a" $(COMPILEDTESTS)
+- ./otags -vi -I $(TYPECONVDIR) -I $(SEXPLIBDIR) \
+- -pa pa_type_conv.cma -pa pa_sexp_conv.cma $(TESTSOURCES_SEXP) \
++ ./otags -vi \
+ -pr $(TESTSOURCES_NORM) \
+ -extern $(TESTSOURCES_EXT) \
+ -o test/test.newtags
+--- a/test/test.TAGS
++++ b/test/test.TAGS
+@@ -1,19 +1,4 @@
+
+-test/g.mli,62
+-G1,0
+-type tt1,0
+-type tt_of_sexp1,0
+-type tsexp_of_t1,0
+-
+-test/f.ml,149
+-F1,0
+-type tt1,0
+-type t = AA1,0
+-type t = A | BB1,0
+-type t = A | B__t_of_sexp__1,0
+-type t = A | Bt_of_sexp1,0
+-type t = A | Bsexp_of_t1,0
+-
+ test/a.ml,2834
+ A1,0
+ let a0a02,1
+--- a/test/test.tags
++++ b/test/test.tags
+@@ -8,7 +8,6 @@
+ @@ test/c.mli /^val (@@) : 'a -> 'b -> 'c$/;
+ A test/a.ml 1;
+ A test/d.ml /^ | A of int$/;
+-A test/f.ml /^type t = A | B with sexp$/;
+ A1 test/d.ml /^ | A1 of b_type$/;
+ A10 test/a.ml /^exception A10 of int * string$/;
+ A12 test/a.ml /^module A12 = Int32$/;
+@@ -46,7 +45,6 @@
+ App test/a.ml /^ | App : ('b -> 'a) a87_term * 'b a87_term -> 'a
a87_term$/;
+ B test/b.ml 1;
+ B test/d.ml /^ | B | C$/;
+-B test/f.ml /^type t = A | B with sexp$/;
+ B1 test/d.ml /^ | B1 of b_type$/;
+ B2 test/d.ml /^ | B2 of a_type$/;
+ C test/c.mli 1;
+@@ -67,12 +65,9 @@
+ E test/e.mli 1;
+ END test/d.ml /^module type END = sig $/;
+ END test/e.mli /^module type END = sig $/;
+-F test/f.ml 1;
+-G test/g.mli 1;
+ Int test/a.ml /^ | Int : int -> int a87_term$/;
+ Modu test/d.ml /^module Modu =$/;
+ No_value test/d.ml /^exception No_value$/;
+-__t_of_sexp__ test/f.ml /^type t = A | B with sexp$/;
+ _a69 test/a.ml /^let _a69 = 5$/;
+ _a70 test/a.ml /^type _a70 = int$/;
+ a test/d.ml /^type a =$/;
+@@ -216,12 +211,6 @@
+ set test/e.mli /^ method set : 'a -> unit$/;
+ set test/e.mli /^ method set : 'a -> unit$/;
+ set test/e.mli /^ method set : 'a -> unit$/;
+-sexp_of_t test/f.ml /^type t = A | B with sexp$/;
+-sexp_of_t test/g.mli /^type t with sexp$/;
+-t test/f.ml /^type t = A | B with sexp$/;
+-t test/g.mli /^type t with sexp$/;
+-t_of_sexp test/f.ml /^type t = A | B with sexp$/;
+-t_of_sexp test/g.mli /^type t with sexp$/;
+ tx test/a.ml /^ type tx$/;
+ tx test/a.ml /^ type tx = int$/;
+ tx test/a.ml /^ type tx = int$/;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ff18984
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-sexplib-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/otags.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
