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
-
06c099b6
by Stephane Glondu at 2026-01-05T14:39:23+01:00
-
b6eecfcc
by Stephane Glondu at 2026-01-05T14:39:46+01:00
-
b77095ed
by Stephane Glondu at 2026-01-05T14:40:25+01:00
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:
| 1 | +ppx-deriving-yojson (3.10.0-2) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Team upload
|
|
| 4 | + * Adapt to yojson 3.0.0
|
|
| 5 | + * Bump Standards-Version to 4.7.3
|
|
| 6 | + * Remove Rules-Requires-Root
|
|
| 7 | + |
|
| 8 | + -- Stéphane Glondu <glondu@debian.org> Mon, 05 Jan 2026 14:40:23 +0100
|
|
| 9 | + |
|
| 1 | 10 | ppx-deriving-yojson (3.10.0-1) unstable; urgency=medium
|
| 2 | 11 | |
| 3 | 12 | * Team upload
|
| ... | ... | @@ -10,11 +10,10 @@ Build-Depends: |
| 10 | 10 | libfindlib-ocaml,
|
| 11 | 11 | cppo,
|
| 12 | 12 | ocaml-dune,
|
| 13 | - libyojson-ocaml-dev,
|
|
| 13 | + libyojson-ocaml-dev (>= 3.0.0),
|
|
| 14 | 14 | libounit-ocaml-dev <!nocheck>,
|
| 15 | 15 | libppx-deriving-ocaml-dev (>= 6.1)
|
| 16 | -Standards-Version: 4.7.2
|
|
| 17 | -Rules-Requires-Root: no
|
|
| 16 | +Standards-Version: 4.7.3
|
|
| 18 | 17 | Homepage: https://github.com/whitequark/ppx_deriving_yojson
|
| 19 | 18 | Vcs-Browser: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson
|
| 20 | 19 | Vcs-Git: https://salsa.debian.org/ocaml-team/ppx-deriving-yojson.git
|
| ... | ... | @@ -7,10 +7,10 @@ Subject: Reduce size of a test too slow on bytecode |
| 7 | 7 | 1 file changed, 1 insertion(+), 1 deletion(-)
|
| 8 | 8 | |
| 9 | 9 | diff --git a/src_test/test_ppx_yojson.ml b/src_test/test_ppx_yojson.ml
|
| 10 | -index 4849db2..bb2b4d5 100644
|
|
| 10 | +index ca4d95b..5df6466 100644
|
|
| 11 | 11 | --- a/src_test/test_ppx_yojson.ml
|
| 12 | 12 | +++ b/src_test/test_ppx_yojson.ml
|
| 13 | -@@ -152,7 +152,7 @@ let test_list _ctxt =
|
|
| 13 | +@@ -155,7 +155,7 @@ let test_list _ctxt =
|
|
| 14 | 14 | if i = 0
|
| 15 | 15 | then (i mod 100 :: acc)
|
| 16 | 16 | else make_list (i - 1) (i mod 100 :: acc) in
|
| 1 | +From: Stephane Glondu <glondu@debian.org>
|
|
| 2 | +Date: Mon, 5 Jan 2026 14:38:51 +0100
|
|
| 3 | +Subject: Adapt to yojson 3.0.0
|
|
| 4 | + |
|
| 5 | +---
|
|
| 6 | + src_test/test_ppx_yojson.ml | 4 +---
|
|
| 7 | + 1 file changed, 1 insertion(+), 3 deletions(-)
|
|
| 8 | + |
|
| 9 | +diff --git a/src_test/test_ppx_yojson.ml b/src_test/test_ppx_yojson.ml
|
|
| 10 | +index 5df6466..7bf45ca 100644
|
|
| 11 | +--- a/src_test/test_ppx_yojson.ml
|
|
| 12 | ++++ b/src_test/test_ppx_yojson.ml
|
|
| 13 | +@@ -8,9 +8,7 @@ type json =
|
|
| 14 | + | `Intlit of string
|
|
| 15 | + | `List of json list
|
|
| 16 | + | `Null
|
|
| 17 | +- | `String of string
|
|
| 18 | +- | `Tuple of json list
|
|
| 19 | +- | `Variant of string * json option ]
|
|
| 20 | ++ | `String of string ]
|
|
| 21 | + [@@deriving show]
|
|
| 22 | +
|
|
| 23 | + let show_error_or = |
| 1 | 1 | 0001-Reduce-size-of-a-test-too-slow-on-bytecode.patch
|
| 2 | +0002-Adapt-to-yojson-3.0.0.patch |