[Pkg-ocaml-maint-commits] [hol-light] 01/01: quick fix for building with camlp5 7.01

[Hendrik Tews]

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

hendrik-guest pushed a commit to branch master
in repository hol-light.

commit e4242ac0a2f43c825cf9e3128de9faffd3051726
Author: Hendrik Tews <hendrik at askra.de>
Date:   Wed Aug 2 23:05:50 2017 +0200

    quick fix for building with camlp5 7.01
---
 debian/changelog              |  8 ++++++++
 debian/control                |  2 +-
 debian/patches/camlp5-7.patch | 23 +++++++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1d6b415..f6978d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hol-light (20170109-2) unstable; urgency=medium
+
+  [ Hendrik Tews ]
+  * add patch camlp5-7 for fixing FTBFS with camlp5-7.01 (Closes: #868606)
+  * update build dependency for camlp5
+
+ -- Hendrik Tews <hendrik at askra.de>  Wed, 02 Aug 2017 23:05:25 +0200
+
 hol-light (20170109-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
diff --git a/debian/control b/debian/control
index a917863..ee0d6bb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
  Hendrik Tews <hendrik at askra.de>
 Build-Depends: 
- camlp5 (>= 6.0.7),
+ camlp5 (>= 7.01),
  ocaml-base-nox,
  dh-ocaml (>= 0.9~),
  debhelper (>= 9.0.0)
diff --git a/debian/patches/camlp5-7.patch b/debian/patches/camlp5-7.patch
new file mode 100644
index 0000000..03bfe11
--- /dev/null
+++ b/debian/patches/camlp5-7.patch
@@ -0,0 +1,23 @@
+Description: quick fix for camlp5-7.01
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/pa_j_3.1x_6.11.ml
++++ b/pa_j_3.1x_6.11.ml
+@@ -320,6 +320,9 @@
+     | ExLmd loc x1 x2 x3 →
+         let loc = floc loc in
+         ExLmd loc x1 (reloc_module_expr floc sh x2) (self x3)
++    | ExLop loc x1 x2 →
++        let loc = floc loc in
++        ExLop loc (reloc_module_expr floc sh x1) (self x2)
+     | ExMat loc x1 x2 →
+         let loc = floc loc in
+         ExMat loc (self x1)
+@@ -356,7 +359,7 @@
+     | ExRpl loc x1 x2 →
+         let loc = floc loc in
+         ExRpl loc (vala_map (option_map self) x1)
+-          ((fun (loc, x1) → (floc loc, x1)) x2)
++          ((vala_map (fun (loc, x1) → (floc loc, x1))) x2)
+     | ExSeq loc x1 →
+         let loc = floc loc in
+         ExSeq loc (vala_map (List.map self) x1)
diff --git a/debian/patches/series b/debian/patches/series
index 023f6f5..7c5871b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 default-hollight-dir
 holtest-no-proof-recording.patch
 cd-holtest-parallel.patch
+camlp5-7.patch

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