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

[Git][ocaml-team/oasis][master] 2 commits: Call ocamlbuild with -use-ocamlfind

Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / oasis

Commits:

  • e335f53a
    by Stephane Glondu at 2024-06-30T11:05:13+02:00 
    Call ocamlbuild with -use-ocamlfind
  • d25ea2d5
    by Stephane Glondu at 2024-06-30T11:07:05+02:00 
    Update changelog and prepare upload to unstable

3 changed files:

Changes:

  • debian/changelog
    1 
    +oasis (0.4.11-5) unstable; urgency=medium
    2 
    +
    3 
    +  * Team upload
    4 
    +  * Call ocamlbuild with -use-ocamlfind
    5 
    +
    6 
    + -- Stéphane Glondu <glondu@debian.org>  Sun, 30 Jun 2024 11:07:01 +0200
    7 
    +
    1 8 
     oasis (0.4.11-4) unstable; urgency=medium
    2 9
    3 10 
       * Team upload

  • debian/patches/0001-Fix-compilation-with-OCaml-5.x.patch
    ... ... @@ -35,14 +35,14 @@ index 6c88506..20ed088 100644
    35 35
    36 36 
      module Data ="">
    37 37 
     diff --git a/src/plugins/ocamlbuild/OCamlbuildCommon.ml b/src/plugins/ocamlbuild/OCamlbuildCommon.ml
    38 
    -index e2c3a33..2759248 100644
    38 
    +index e2c3a33..9a6de2b 100644
    39 39 
     --- a/src/plugins/ocamlbuild/OCamlbuildCommon.ml
    40 40 
     +++ b/src/plugins/ocamlbuild/OCamlbuildCommon.ml
    41 41 
     @@ -52,6 +52,8 @@ let ocamlbuildflags =
    42 42 
      let fix_args args extra_argv =
    43 43 
        List.flatten
    44 44 
          [
    45 
    -+      ["-tag"; "package\\(camlp-streams\\)"; "-plugin-tag"; "package\\(camlp-streams\\)"];
    45 
    ++      ["-use-ocamlfind"; "-tag"; "package\\(camlp-streams\\)"; "-plugin-tag"; "package\\(camlp-streams\\)"];
    46 46 
     +
    47 47 
            if (os_type ()) = "Win32" then
    48 48 
              [

  • debian/patches/0002-Fix-build-with-OCaml-5.x.patch
    ... ... @@ -7,7 +7,7 @@ Subject: Fix build with OCaml 5.x
    7 7 
      1 file changed, 12 insertions(+), 10 deletions(-)
    8 8
    9 9 
     diff --git a/setup.ml b/setup.ml
    10 
    -index e7d559b..c292405 100644
    10 
    +index e7d559b..a5d28ff 100644
    11 11 
     --- a/setup.ml
    12 12 
     +++ b/setup.ml
    13 13 
     @@ -21,9 +21,9 @@
    ... ... @@ -44,7 +44,7 @@ index e7d559b..c292405 100644
    44 44 
        let fix_args args extra_argv =
    45 45 
          List.flatten
    46 46 
            [
    47 
    -+        ["-tag"; "package\\(camlp-streams\\)"; "-plugin-tag"; "package\\(camlp-streams\\)"];
    47 
    ++        ["-use-ocamlfind"; "-tag"; "package\\(camlp-streams\\)"; "-plugin-tag"; "package\\(camlp-streams\\)"];
    48 48 
     +
    49 49 
              if (os_type ()) = "Win32" then
    50 50 
                [

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: