[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/morbig][master] 2 commits: Add fix_yojson_2.patch

Title: GitLab

Julien Puydt pushed to branch master at Debian OCaml Maintainers / morbig

Commits:

  • e37d4996
    by Julien Puydt at 2022-08-12T22:05:51+02:00 
    Add fix_yojson_2.patch
  • 0707959d
    by Julien Puydt at 2022-08-12T22:08:08+02:00 
    Prepare for upload to experimental

4 changed files:

Changes:

  • debian/changelog
    1 
    -morbig (0.10.4-6) UNRELEASED; urgency=medium
    1 
    +morbig (0.10.4-5.1) experimental; urgency=medium
    2 2
    3 
    +  [ Ralf Treinen ]
    3 4 
       * upstream/metadata:
    4 5 
         - remove deprecated fields "name" and "contact"
    5 6 
         - update reference
    6 7
    7 
    - --
    8 
    +  [ Julien Puydt ]
    9 
    +  * Team upload.
    10 
    +  * Add fix_yojson_2.patch.
    11 
    +
    12 
    + -- Julien Puydt <jpuydt@debian.org>  Fri, 12 Aug 2022 22:06:35 +0200
    8 13
    9 14 
     morbig (0.10.4-5) unstable; urgency=medium
    10 15

  • debian/control
    ... ... @@ -12,7 +12,7 @@ Build-Depends: debhelper-compat (= 13), dh-ocaml,
    12 12 
      libmenhir-ocaml-dev (>= 20170509),
    13 13 
      libppx-deriving-yojson-ocaml-dev,
    14 14 
      libppx-visitors-ocaml-dev (>= 20180513),
    15 
    - libyojson-ocaml-dev (>= 1.3.2),
    15 
    + libyojson-ocaml-dev (>= 2.0.2),
    16 16 
     Standards-Version: 4.6.0
    17 17 
     Rules-Requires-Root: no
    18 18 
     Homepage: https://github.com/colis-anr/morbig

  • debian/patches/fix_yojson_2.patch
    1 
    +Description: add support for yojson 2
    2 
    +Author: Julien Puydt
    3 
    +Forwarded: https://github.com/colis-anr/morbig/issues/134
    4 
    +
    5 
    +--- morbig.orig/src/CSTHelpers.mli
    6 
    ++++ morbig/src/CSTHelpers.mli
    7 
    +@@ -19,8 +19,8 @@
    8 
    + val nonempty_program : program -> bool
    9 
    + val concat_programs : program located -> program located -> program located
    10 
    +
    11 
    +-val complete_command_to_json : complete_command -> Yojson.Safe.json
    12 
    +-val program_to_json : program -> Yojson.Safe.json
    13 
    ++val complete_command_to_json : complete_command -> Yojson.Safe.t
    14 
    ++val program_to_json : program -> Yojson.Safe.t
    15 
    +
    16 
    + (** {2 Helpers about words and names} *)
    17 
    +
    18 
    +--- morbig.orig/morbig.opam
    19 
    ++++ morbig/morbig.opam
    20 
    +@@ -31,7 +31,7 @@
    21 
    +   "odoc"                 {with-doc}
    22 
    +   "ppx_deriving_yojson"
    23 
    +   "visitors"             {>= "20180513"}
    24 
    +-  "yojson"
    25 
    ++  "yojson"               {>= "2.0.2"}
    26 
    + ]
    27 
    +
    28 
    + build: ["dune" "build" "-p" name "-j" jobs]

  • debian/patches/series
    1 1 
     generate-documentation
    2 
    +fix_yojson_2.patch

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: