diff -Nru ppx-sexp-conv-0.14.1/CHANGES.md ppx-sexp-conv-0.14.3/CHANGES.md --- ppx-sexp-conv-0.14.1/CHANGES.md 2020-08-27 16:24:36.000000000 +0000 +++ ppx-sexp-conv-0.14.3/CHANGES.md 2021-02-18 14:45:04.000000000 +0000 @@ -1,3 +1,7 @@ +## v0.14.2 + +- Upgrade to ppxlib 0.18.0 + ## v0.14.1 - Depend on ppxlib >= v0.15.0. diff -Nru ppx-sexp-conv-0.14.1/debian/changelog ppx-sexp-conv-0.14.3/debian/changelog --- ppx-sexp-conv-0.14.1/debian/changelog 2021-12-09 02:19:45.000000000 +0000 +++ ppx-sexp-conv-0.14.3/debian/changelog 2022-01-25 13:42:29.000000000 +0000 @@ -1,14 +1,16 @@ -ppx-sexp-conv (1:0.14.1-1build2) jammy; urgency=medium +ppx-sexp-conv (1:0.14.3-1build1) jammy; urgency=medium - * No-change rebuild for current ocaml ABIs + * No-change rebuild for ocaml abi changes. - -- Steve Langasek Thu, 09 Dec 2021 02:19:45 +0000 + -- Matthias Klose Tue, 25 Jan 2022 14:42:29 +0100 -ppx-sexp-conv (1:0.14.1-1build1) hirsute; urgency=medium +ppx-sexp-conv (1:0.14.3-1) unstable; urgency=medium - * No-change rebuild for ocaml abi changes. + * New upstream release + * Bump Standards-Version to 4.6.0 + * Update debian/watch - -- Matthias Klose Sun, 13 Dec 2020 11:53:11 +0100 + -- Stéphane Glondu Fri, 21 Jan 2022 00:30:39 +0100 ppx-sexp-conv (1:0.14.1-1) unstable; urgency=medium diff -Nru ppx-sexp-conv-0.14.1/debian/control ppx-sexp-conv-0.14.3/debian/control --- ppx-sexp-conv-0.14.1/debian/control 2021-12-09 02:19:45.000000000 +0000 +++ ppx-sexp-conv-0.14.3/debian/control 2022-01-20 23:30:39.000000000 +0000 @@ -1,19 +1,18 @@ Source: ppx-sexp-conv Section: ocaml Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian OCaml Maintainers +Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: debhelper-compat (= 13), - ocaml-nox, + ocaml, ocaml-findlib, ocaml-dune, libbase-ocaml-dev (>= 0.14), libsexplib0-ocaml-dev (>= 0.14), - libppxlib-ocaml-dev (>= 0.15.0), + libppxlib-ocaml-dev (>= 0.22.0), dh-ocaml -Standards-Version: 4.5.0 +Standards-Version: 4.6.0 Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/ocaml-team/ppx-sexp-conv Vcs-Git: https://salsa.debian.org/ocaml-team/ppx-sexp-conv.git diff -Nru ppx-sexp-conv-0.14.1/debian/watch ppx-sexp-conv-0.14.3/debian/watch --- ppx-sexp-conv-0.14.1/debian/watch 2020-11-09 03:24:50.000000000 +0000 +++ ppx-sexp-conv-0.14.3/debian/watch 2022-01-20 23:30:39.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/ppx_sexp_conv/tags /.*/archive/v([\d\.\-rc]+)\.tar\.gz +version=4 +opts=uversionmangle=s/-rc/~rc/ https://github.com/janestreet/ppx_sexp_conv/tags .*/v?([\d\.\-rc]+)\.tar\.gz diff -Nru ppx-sexp-conv-0.14.1/expander/sexp_grammar_lifter.ml ppx-sexp-conv-0.14.3/expander/sexp_grammar_lifter.ml --- ppx-sexp-conv-0.14.1/expander/sexp_grammar_lifter.ml 2020-08-27 16:24:36.000000000 +0000 +++ ppx-sexp-conv-0.14.3/expander/sexp_grammar_lifter.ml 2021-02-18 14:45:04.000000000 +0000 @@ -28,7 +28,7 @@ type var_name = Sexp.Private.Raw_grammar.var_name type type_name = Sexp.Private.Raw_grammar.type_name -let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, None)) +let lift_string ~loc s = pexp_constant ~loc (Pconst_string (s, loc, None)) let lift_var_name = lift_string let lift_type_name = lift_string diff -Nru ppx-sexp-conv-0.14.1/expander/str_generate_sexp_grammar.ml ppx-sexp-conv-0.14.3/expander/str_generate_sexp_grammar.ml --- ppx-sexp-conv-0.14.1/expander/str_generate_sexp_grammar.ml 2020-08-27 16:24:36.000000000 +0000 +++ ppx-sexp-conv-0.14.3/expander/str_generate_sexp_grammar.ml 2021-02-18 14:45:04.000000000 +0000 @@ -604,7 +604,7 @@ let type_variables, core_type = collect_type_variables_of_polymorphic_grammar core_type in - ( List.map type_variables ~f:(fun var_name -> ptyp_var ~loc var_name, Invariant) + ( List.map type_variables ~f:(fun var_name -> ptyp_var ~loc var_name, (NoVariance, NoInjectivity)) , core_type ) in let td = diff -Nru ppx-sexp-conv-0.14.1/ppx_sexp_conv.opam ppx-sexp-conv-0.14.3/ppx_sexp_conv.opam --- ppx-sexp-conv-0.14.1/ppx_sexp_conv.opam 2020-08-27 16:24:36.000000000 +0000 +++ ppx-sexp-conv-0.14.3/ppx_sexp_conv.opam 2021-02-18 14:45:04.000000000 +0000 @@ -15,7 +15,7 @@ "base" {>= "v0.14" & < "v0.15"} "sexplib0" {>= "v0.14" & < "v0.15"} "dune" {>= "2.0.0"} - "ppxlib" {>= "0.11.0"} + "ppxlib" {>= "0.22.0"} ] synopsis: "[@@deriving] plugin to generate S-expression conversion functions" description: "