From 94e902e8988b6330b5f2728ff2700dc8ce4d92ed Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Thu, 12 Mar 2026 17:32:24 -0400 Subject: [PATCH] chore: create new release 0.11.0 --- CHANGELOG.md | 6 +++++- ...o.github.mightycreak.Diffuse.appdata.xml.in | 18 ++++++++++++++++++ .../usr/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 ++-- meson.build | 2 +- utils/book2manual.xsl | 4 ++-- windows-installer/build.py | 2 +- windows-installer/diffuse.iss | 2 +- 14 files changed, 40 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a33e0b5..7f274bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## [Unreleased] + +## [0.11.0] - 2026-03-12 ### Changed @@ -616,6 +618,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - initial public release +[Unreleased]: https://github.com/MightyCreak/diffuse/compare/v0.11.0...HEAD +[0.11.0]: https://github.com/MightyCreak/diffuse/compare/v0.10.0...v0.11.0 [0.10.0]: https://github.com/MightyCreak/diffuse/compare/v0.9.0...v0.10.0 [0.9.0]: https://github.com/MightyCreak/diffuse/compare/v0.8.2...v0.9.0 [0.8.2]: https://github.com/MightyCreak/diffuse/compare/v0.8.1...v0.8.2 diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index a2b43a7..f59ec00 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -43,6 +43,24 @@ romain@foolstep.com + + +

Summary: allow multiple `-r` flags in command-line, update to GNOME 49.

+

Changed:

+
    +
  • Update release process documentation (@MightyCreak)
    • +
  • Minimal Pytnon release is now 3.10 (@MightyCreak)
    • +
  • Update flatpak's GNOME runtime to 49 (@MightyCreak)
    • +
  • Update PyPi requirements (@MightyCreak)
    • +
+

Fixed:

+
    +
  • fix(cicd): update Github CI/CD script (@MightyCreak)
    • +
  • Fix #246: Re-instate ability + to provide multiple revs eg diffuse -r v1 -r v2 file (@bhepple)
    • +
+ +

Summary: update to GNOME 48, updated a few translations.

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index 008180b..a4db8f2 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 d72f77c..088be89 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 699bbd8..107335a 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 d0f1b66..3ec4870 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 5dc5680..38da6d1 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 - 2025-05-24 - + 2026-03-12 + 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 a253846..96e4ab5 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 - 2025-05-24 - + 2026-03-12 + 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 7e6db8c..b87dfc6 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 - 2025-05-24 - + 2026-03-12 + 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 268ef6e..b61f2e4 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 - 2025-05-24 - + 2026-03-12 + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/meson.build b/meson.build index d8bc729..cecbed2 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.10.0', + version: '0.11.0', 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 4e0e254..e7c18dd 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,9 +1,9 @@ - + - + ]>