From 6a757c45f7f024dfa1f94bb4a213d3d6fc72c6de Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Sun, 16 Apr 2023 13:28:24 -0400 Subject: [PATCH 1/2] release: new release 0.8.2 --- CHANGELOG.md | 2 ++ ....github.mightycreak.Diffuse.appdata.xml.in | 23 +++++++++++++++++++ .../share/gnome/help/diffuse/C/diffuse.xml | 2 +- .../share/gnome/help/diffuse/cs/diffuse.xml | 2 +- .../share/gnome/help/diffuse/it/diffuse.xml | 2 +- .../share/gnome/help/diffuse/ru/diffuse.xml | 2 +- data/usr/share/omf/diffuse/diffuse-C.omf | 4 ++-- data/usr/share/omf/diffuse/diffuse-cs.omf | 4 ++-- data/usr/share/omf/diffuse/diffuse-it.omf | 4 ++-- data/usr/share/omf/diffuse/diffuse-ru.omf | 4 ++-- docs/developers/release-process.md | 13 ++++++----- meson.build | 2 +- utils/book2manual.xsl | 4 ++-- windows-installer/build.py | 2 +- windows-installer/diffuse.iss | 2 +- 15 files changed, 49 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2fdf37..9517d21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## 0.8.2 - 2023-04-16 + ### Added - Add link to the Matrix room in the README (@MightyCreak) diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index 3e1a048..f1ffbf7 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -37,6 +37,29 @@ romain@foolstep.com + + +

Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.

+

Added:

+
    +
  • Add link to the Matrix room in the README (@MightyCreak)
    • +
  • Add Dutch translation (@Vistaus)
    • +
+

Changed:

+
    +
  • Replace `_` by `-` in the action names to be compatible with GTK action names (@MightyCreak)
    • +
  • The About dialog is now transient for the main window (@oscfdezdz)
    • +
  • Remove deprecated STOCK constants and use more modern, symbolic icons (@oscfdezdz)
    • +
+

Fixed:

+
    +
  • Some signals weren't properly renamed from the previous GTK3 migration (@MightyCreak)
    • +
  • The syntax menu wasn't working anymore (@MightyCreak)
    • +
  • Properly handles SIGINT (i.e. Ctrl+C) now (@MightyCreak)
    • +
  • Add back `save_state()` to remember window's width and height (@MightyCreak)
    • +
+ +

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index 84f5bb4..3e19bb6 100644 --- a/data/usr/share/gnome/help/diffuse/C/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/C/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml index 43d5c2a..bec3927 100644 --- a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/data/usr/share/gnome/help/diffuse/it/diffuse.xml index cfc0a17..d4b4a2d 100644 --- a/data/usr/share/gnome/help/diffuse/it/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/it/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml index 8406207..e867499 100644 --- a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/usr/share/omf/diffuse/diffuse-C.omf index 969be9f..1c97c86 100644 --- a/data/usr/share/omf/diffuse/diffuse-C.omf +++ b/data/usr/share/omf/diffuse/diffuse-C.omf @@ -4,8 +4,8 @@ Derrick Moser Derrick Moser Diffuse User's Manual - 2023-04-07 - + 2023-04-16 + Diffuse is a graphical tool for merging and comparing text files. manual diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/usr/share/omf/diffuse/diffuse-cs.omf index 78eb139..e394ee7 100644 --- a/data/usr/share/omf/diffuse/diffuse-cs.omf +++ b/data/usr/share/omf/diffuse/diffuse-cs.omf @@ -4,8 +4,8 @@ Derrick Moser Derrick Moser Uživatelská příručka programu Diffuse - 2023-04-07 - + 2023-04-16 + Diffuse je grafický nástroj pro slučování a porovnávání textových souborů. manual diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/usr/share/omf/diffuse/diffuse-it.omf index 0789e09..bb22a72 100644 --- a/data/usr/share/omf/diffuse/diffuse-it.omf +++ b/data/usr/share/omf/diffuse/diffuse-it.omf @@ -4,8 +4,8 @@ Derrick Moser Derrick Moser Manuale utente di Diffuse - 2023-04-07 - + 2023-04-16 + Diffuse è uno strumento grafico per l'unione e il confronto di file di testo. manual diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf index 460dfaa..a4c9186 100644 --- a/data/usr/share/omf/diffuse/diffuse-ru.omf +++ b/data/usr/share/omf/diffuse/diffuse-ru.omf @@ -4,8 +4,8 @@ Derrick Moser Derrick Moser Руководство Пользователя Diffuse - 2023-04-07 - + 2023-04-16 + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/docs/developers/release-process.md b/docs/developers/release-process.md index 4b82206..a6f4a30 100644 --- a/docs/developers/release-process.md +++ b/docs/developers/release-process.md @@ -9,11 +9,11 @@ few manual steps. 1. Find the next version, using semantic versioning (e.g. `1.2.3`), depending on the changes in the changelog -2. Execute `./new_release NEW_VERSION` (replace `NEW_VERSION` with the new version) -3. Update the AppData release notes in data/io.github.mightycreak.Diffuse.appdata.xml.in: - - Look for the empty `

` tag under the new `` tag - - Add a paragraph to sum the release in one sentence (e.g. highlights, ...) - - Paste the changes from CHANGELOG.md and adapt it to HTML (see other +2. Execute `./new_release.sh NEW_VERSION` (replace `NEW_VERSION` with the new version) +3. Update the AppData release notes in `data/io.github.mightycreak.Diffuse.appdata.xml.in`: + - Look for the `` tag under the new `` tag + - Sum the release in one sentence in the `

` tag (e.g. highlights, ...) + - Paste the changes from CHANGELOG.md, and adapt it to HTML (see other releases in the file) ### Create branch, PR and merge @@ -25,7 +25,8 @@ few manual steps. ## Create new release on GitHub 1. Create a new release on GitHub's [new release page](https://github.com/MightyCreak/diffuse/releases/new): - - Choose a tag: `v` followed with the new version (e.g. `v1.2.3`) + - Release tag: Enter `v` followed with the new version (e.g. `v1.2.3`) and + create the tag - Release title: the tag (e.g. `v1.2.3`) - Description: - For the first paragraph, paste the first paragraph from the release notes diff --git a/meson.build b/meson.build index 6168824..0cc86f6 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.8.1', + version: '0.8.2', meson_version: '>= 0.55', license: 'GPL-2.0-or-later', default_options: [ 'warning_level=2' ]) diff --git a/utils/book2manual.xsl b/utils/book2manual.xsl index c1fb5a8..967914e 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,9 +1,9 @@ - + - + ]>