Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ppx-deriving-yojson
Commits: 8581a415 by Stephane Glondu at 2026-01-05T14:39:12+01:00 Refresh patches - - - - - 06c099b6 by Stephane Glondu at 2026-01-05T14:39:23+01:00 Adapt to yojson 3.0.0 - - - - - b6eecfcc by Stephane Glondu at 2026-01-05T14:39:46+01:00 Update packaging - - - - - b77095ed by Stephane Glondu at 2026-01-05T14:40:25+01:00 Update changelog and prepare upload to unstable - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/0001-Reduce-size-of-a-test-too-slow-on-bytecode.patch - + debian/patches/0002-Adapt-to-yojson-3.0.0.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +ppx-deriving-yojson (3.10.0-2) unstable; urgency=medium + + * Team upload + * Adapt to yojson 3.0.0 + * Bump Standards-Version to 4.7.3 + * Remove Rules-Requires-Root + + -- Stéphane Glondu <[email protected]> Mon, 05 Jan 2026 14:40:23 +0100 + ppx-deriving-yojson (3.10.0-1) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -10,11 +10,10 @@ Build-Depends: libfindlib-ocaml, cppo, ocaml-dune, - libyojson-ocaml-dev, + libyojson-ocaml-dev (>= 3.0.0), libounit-ocaml-dev <!nocheck>, libppx-deriving-ocaml-dev (>= 6.1) -Standards-Version: 4.7.2 -Rules-Requires-Root: no +Standards-Version: 4.7.3 Homepage: https://github.com/whitequark/ppx_deriving_yojson Vcs-Browser: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson Vcs-Git: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson.git ===================================== debian/patches/0001-Reduce-size-of-a-test-too-slow-on-bytecode.patch ===================================== @@ -7,10 +7,10 @@ Subject: Reduce size of a test too slow on bytecode 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_test/test_ppx_yojson.ml b/src_test/test_ppx_yojson.ml -index 4849db2..bb2b4d5 100644 +index ca4d95b..5df6466 100644 --- a/src_test/test_ppx_yojson.ml +++ b/src_test/test_ppx_yojson.ml -@@ -152,7 +152,7 @@ let test_list _ctxt = +@@ -155,7 +155,7 @@ let test_list _ctxt = if i = 0 then (i mod 100 :: acc) else make_list (i - 1) (i mod 100 :: acc) in ===================================== debian/patches/0002-Adapt-to-yojson-3.0.0.patch ===================================== @@ -0,0 +1,23 @@ +From: Stephane Glondu <[email protected]> +Date: Mon, 5 Jan 2026 14:38:51 +0100 +Subject: Adapt to yojson 3.0.0 + +--- + src_test/test_ppx_yojson.ml | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src_test/test_ppx_yojson.ml b/src_test/test_ppx_yojson.ml +index 5df6466..7bf45ca 100644 +--- a/src_test/test_ppx_yojson.ml ++++ b/src_test/test_ppx_yojson.ml +@@ -8,9 +8,7 @@ type json = + | `Intlit of string + | `List of json list + | `Null +- | `String of string +- | `Tuple of json list +- | `Variant of string * json option ] ++ | `String of string ] + [@@deriving show] + + let show_error_or = ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 0001-Reduce-size-of-a-test-too-slow-on-bytecode.patch +0002-Adapt-to-yojson-3.0.0.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson/-/compare/80bbe5cb459ca7f451a8adabcc2543ce3169be57...b77095ed69bc8f0d0895c6db7d15ed906ae25d78 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson/-/compare/80bbe5cb459ca7f451a8adabcc2543ce3169be57...b77095ed69bc8f0d0895c6db7d15ed906ae25d78 You're receiving this email because of your account on salsa.debian.org.
