From aa447ac9747932ef61a6143299dc4fd134a9c3bb Mon Sep 17 00:00:00 2001 From: Emilio Jesus Gallego Arias Date: Tue, 12 Feb 2019 19:13:30 +0100 Subject: [PATCH] [opam] [dune-release] Fix opam metadata to reflect recent release. After 3.0.beta4, the loose constraints should mostly work; depending on the changes we do of course. We also update the `homepage` field of the OPAM files, and the CHANGES file, if I understand correctly this should indeed make `dune-release` work out of the box [and to produce sensible changelogs] Note that dune-release was incorrectly reading `CHANGES.API` to create the OPAM changelog! So I had to fix that too. --- .travis.yml | 1 + CHANGES.API => CHANGELOG.API | 0 CHANGES => CHANGES.md | 15 ++++++++++----- README.dune.md | 7 +++++++ README => README.md | 0 lablgtk3-gtkspell3.opam | 15 +++++++++------ lablgtk3-sourceview3.opam | 14 ++++++++------ lablgtk3.opam | 10 +++++++--- 8 files changed, 42 insertions(+), 20 deletions(-) rename CHANGES.API => CHANGELOG.API (100%) rename CHANGES => CHANGES.md (99%) rename README => README.md (100%) diff --git a/.travis.yml b/.travis.yml index 0aa67f22..83b100a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,5 +54,6 @@ install: | script: - set -e - echo 'Building LablGtk...' && echo -en 'travis_fold:start:lablgtk.build\\r' +- pkg-config --list-all - make -f Makefile.travis "$TEST_TARGET" - echo -en 'travis_fold:end:lablgtk.build\\r' diff --git a/CHANGES.API b/CHANGELOG.API similarity index 100% rename from CHANGES.API rename to CHANGELOG.API diff --git a/CHANGES b/CHANGES.md similarity index 99% rename from CHANGES rename to CHANGES.md index fb6f9574..bad77f70 100644 --- a/CHANGES +++ b/CHANGES.md @@ -1,6 +1,11 @@ -# LablGTK changes log +LablGTK changes log -In Lablgtk-3.0.beta4: +## In Lablgtk-3.0.beta5: + +2019.02.12 [Emilio] + * Update OPAM files so they work better with dune-release + +## In Lablgtk-3.0.beta4: 2019.02.11 [Jacques] * More dune related PRs (#39, #43, #45, #46) [Emilio] @@ -11,7 +16,7 @@ In Lablgtk-3.0.beta4: * Move initialization functions to Props files, to avoid problem with -no-alias-deps (cf GPR#39) -In Lablgtk-3.0.beta3: +## In Lablgtk-3.0.beta3: 2019.01.11 [Jacques] * Update propcc.ml4 as suggested by Virgile Prevosto @@ -42,7 +47,7 @@ In Lablgtk-3.0.beta3: * Resurect GMenu.separator_item * fix examples eventbox.ml, events.ml, editor2.ml -In Lablgtk-3.0.beta2: +## In Lablgtk-3.0.beta2: 2018.12.14 [Jacques] * Remove unsupported extensions from configure @@ -85,7 +90,7 @@ In Lablgtk-3.0.beta2: 2018.08.25 [Francois Bobot] * Add require for threads in META -In Lablgtk-2.18.6: +## In Lablgtk-2.18.6: 2017.10.30 [Jacques] * prepare release diff --git a/README.dune.md b/README.dune.md index 4efb68ac..da957365 100644 --- a/README.dune.md +++ b/README.dune.md @@ -38,6 +38,13 @@ auto-generated in the future using Dune's promote mechanism. The preferred workflow to release a new set of OPAM packages is to use `dune-release`. +### Format of the CHANGES.md file + +`dune-release` will take each top-level markdown item as the changelog +for the current version, thus be aware of not introducing `#` markers. + +### Detailed notes + The first (and most important) step is to tag the release and push it to the main repository. diff --git a/README b/README.md similarity index 100% rename from README rename to README.md diff --git a/lablgtk3-gtkspell3.opam b/lablgtk3-gtkspell3.opam index eb9e5775..65fc4541 100644 --- a/lablgtk3-gtkspell3.opam +++ b/lablgtk3-gtkspell3.opam @@ -1,11 +1,16 @@ opam-version: "2.0" -description: "OCaml interface to GTK+, gtksourceview2 library" -synopsis: "OCaml interface to GTK+" +synopsis: "OCaml interface to GTK+3" +description: """ +OCaml interface to GTK+3, gtkspell library + +See http://lablgtk.forge.ocamlcore.org/ for more information. + +""" maintainer: "garrigue@math.nagoya-u.ac.jp" authors: ["Jacques Garrigue et al., Nagoya University"] -homepage: "http://lablgtk.forge.ocamlcore.org/" +homepage: "https://github.com/garrigue/lablgtk" bug-reports: "https://github.com/garrigue/lablgtk/issues" dev-repo: "git+https://github.com/garrigue/lablgtk.git" doc: "https://garrigue.github.io/lablgtk/lablgtk-sourceview" @@ -14,9 +19,7 @@ license: "LGPL with linking exception" depends: [ "ocaml" { >= "4.05.0" } "dune" { build & >= "1.4.0" } - "lablgtk3" { } - # To fix when opam is updated - # "lablgtk3" { >= "3.0.beta4" } + "lablgtk3" { >= "3.0.beta4" } ] build: [ diff --git a/lablgtk3-sourceview3.opam b/lablgtk3-sourceview3.opam index 9eee8ad8..00042297 100644 --- a/lablgtk3-sourceview3.opam +++ b/lablgtk3-sourceview3.opam @@ -1,11 +1,15 @@ opam-version: "2.0" -description: "OCaml interface to GTK+, gtksourceview2 library" -synopsis: "OCaml interface to GTK+" +synopsis: "OCaml interface to GTK+ gtksourceview library" +description: """ +OCaml interface to GTK+3, gtksourceview3 library. + +See http://lablgtk.forge.ocamlcore.org/ for more information. +""" maintainer: "garrigue@math.nagoya-u.ac.jp" authors: ["Jacques Garrigue et al., Nagoya University"] -homepage: "http://lablgtk.forge.ocamlcore.org/" +homepage: "https://github.com/garrigue/lablgtk" bug-reports: "https://github.com/garrigue/lablgtk/issues" dev-repo: "git+https://github.com/garrigue/lablgtk.git" doc: "https://garrigue.github.io/lablgtk/lablgtk-sourceview" @@ -14,9 +18,7 @@ license: "LGPL with linking exception" depends: [ "ocaml" { >= "4.05.0" } "dune" { build & >= "1.4.0" } - "lablgtk3" { } - # To fix when opam is updated - # "lablgtk3" { >= "3.0.beta4" } + "lablgtk3" { >= "3.0.beta4" } "conf-gtksourceview3" { build & >= "0" } ] diff --git a/lablgtk3.opam b/lablgtk3.opam index e59410ce..5beda336 100644 --- a/lablgtk3.opam +++ b/lablgtk3.opam @@ -1,11 +1,15 @@ opam-version: "2.0" -description: "OCaml interface to GTK+" -synopsis: "OCaml interface to GTK+" +synopsis: "OCaml interface to GTK+3" +description: """ +OCaml interface to GTK+3 + +See http://lablgtk.forge.ocamlcore.org/ for more information. +""" maintainer: "garrigue@math.nagoya-u.ac.jp" authors: ["Jacques Garrigue et al., Nagoya University"] -homepage: "http://lablgtk.forge.ocamlcore.org/" +homepage: "https://github.com/garrigue/lablgtk" bug-reports: "https://github.com/garrigue/lablgtk/issues" dev-repo: "git+https://github.com/garrigue/lablgtk.git" license: "LGPL with linking exception"