diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ffae18..c5275da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## [0.10.0] - 2025-05-24 + +## [0.10.0] - 2025-05-24 + ### Changed - Translation: update French translation (@WedoneOfficiel) @@ -24,7 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Docs: fix incorrect flatpak command to install runtime SDK (@MightyCreak) - Update GitHub actions: use Ubuntu 24.04, Python 3.9 and new Flatpak image (@MightyCreak) -## 0.9.0 - 2024-01-13 +## [0.9.0] - 2024-01-13 ### Changed @@ -47,7 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix new errors raised by Flake8 (@MightyCreak) - Fix the error with the CICD due to the use of `appstreamcli` (@MightyCreak) -## 0.8.2 - 2023-04-16 +## [0.8.2] - 2023-04-16 ### Added @@ -67,7 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Properly handles SIGINT (i.e. Ctrl+C) now (@MightyCreak) - Add back `save_state()` to remember window's width and height (@MightyCreak) -## 0.8.1 - 2023-04-07 +## [0.8.1] - 2023-04-07 ### Changed @@ -82,7 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Shortcuts were not working since the move to Gtk.Application (issue [#188](https://github.com/MightyCreak/diffuse/issues/188)) (@MightyCreak) -## 0.8.0 - 2023-04-03 +## [0.8.0] - 2023-04-03 ### Added @@ -110,7 +114,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Documentation: prefer `pip3` over `pip` to ensure it works everywhere (@krlmlr) - Flatpak: add missing `--filesystem=xdg-run/gvfsd` privilege (@MightyCreak) -## 0.7.7 - 2022-10-23 +## [0.7.7] - 2022-10-23 ### Changed @@ -118,7 +122,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Translation: updated POT file - Translation: fixed issue with commented string that still needs translation -## 0.7.6 - 2022-10-23 +## [0.7.6] - 2022-10-23 ### Added @@ -134,7 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed MyPy errors -## 0.7.5 - 2022-04-15 +## [0.7.5] - 2022-04-15 ### Added @@ -147,7 +151,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Cleanups: use constructors instead of `new()` whenever possible in GTK classes -## 0.7.4 - 2022-04-03 +## [0.7.4] - 2022-04-03 ### Added @@ -176,7 +180,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed the lasting lint errors (i.e. in main.py) - Fix Flatpak runtime version in documentation -## 0.7.3 - 2021-11-22 +## [0.7.3] - 2021-11-22 ### Added @@ -195,7 +199,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The intense code cleaning seems to have fixed a bug with the `-c` argument (#120) -## 0.7.2 - 2021-11-18 +## [0.7.2] - 2021-11-18 ### Added @@ -214,14 +218,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed 'APP_NAME' error when opening non existing file - Fixed the Portuguese Brazilian (pt_BR) translation -## 0.7.1 - 2021-11-17 +## [0.7.1] - 2021-11-17 ### Fixed - Fixed #103: the flatpak app can now call binaries on the host, such as `git`, `svn`, etc. (PR #105) -## 0.7.0 - 2021-11-16 +## [0.7.0] - 2021-11-16 ### Added @@ -244,7 +248,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed some GTK deprecation warnings -## 0.6.0 - 2020-11-29 +## [0.6.0] - 2020-11-29 ### Added @@ -257,7 +261,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replaced some interpolation operators (`%`) for the `f` string prefix - Use the window scale factor for the icons generation -## 0.5.0 - 2020-07-18 +## [0.5.0] - 2020-07-18 ### Added @@ -600,3 +604,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - initial public release + +[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 +[0.8.1]: https://github.com/MightyCreak/diffuse/compare/v0.8.0...v0.8.1 +[0.8.0]: https://github.com/MightyCreak/diffuse/compare/v0.7.7...v0.8.0 +[0.7.7]: https://github.com/MightyCreak/diffuse/compare/v0.7.6...v0.7.7 +[0.7.6]: https://github.com/MightyCreak/diffuse/compare/v0.7.5...v0.7.6 +[0.7.5]: https://github.com/MightyCreak/diffuse/compare/v0.7.4...v0.7.5 +[0.7.4]: https://github.com/MightyCreak/diffuse/compare/v0.7.3...v0.7.4 +[0.7.3]: https://github.com/MightyCreak/diffuse/compare/v0.7.2...v0.7.3 +[0.7.2]: https://github.com/MightyCreak/diffuse/compare/v0.7.1...v0.7.2 +[0.7.1]: https://github.com/MightyCreak/diffuse/compare/v0.7.0...v0.7.1 +[0.7.0]: https://github.com/MightyCreak/diffuse/compare/v0.6.0...v0.7.0 +[0.6.0]: https://github.com/MightyCreak/diffuse/compare/v0.5.0...v0.6.0 +[0.5.0]: https://github.com/MightyCreak/diffuse/compare/v0.4.8...v0.5.0 diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index 191e6df..a2b43a7 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -43,6 +43,28 @@ romain@foolstep.com + + +

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

+

Changed:

+
    +
  • Translation: update French translation (@WedoneOfficiel)
    • +
  • Translation: update Italian translation (@albanobattistella)
    • +
  • Translation: update Portuguese translation (@hugok79)
    • +
  • Translation: update Brazilian Portuguese translation (@johnpetersa19)
    • +
  • Translation: add 'nl' in LINGUAS (@hugok79)
    • +
  • Update pypi packages (@MightyCreak)
    • +
  • Add pre-commit git hooks to run linters (@MightyCreak)
    • +
  • Docs: improve devs setup structure (@MightyCreak)
    • +
  • Update to flatpak's GNOME runtime 48 (@MightyCreak)
    • +
+

Fixed:

+
    +
  • Docs: fix incorrect flatpak command to install runtime SDK (@MightyCreak)
    • +
  • Update GitHub actions: use Ubuntu 24.04, Python 3.9 and new Flatpak image (@MightyCreak)
    • +
+ +

Summary: remove support for SVK, update to GNOME 45, updated Turkish translation.

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index 525aa35..008180b 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 2c08202..d72f77c 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 b92b8ce..699bbd8 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 feb2052..d0f1b66 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 01ab211..5dc5680 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 - 2024-01-13 - + 2025-05-24 + 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 2701075..a253846 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 - 2024-01-13 - + 2025-05-24 + 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 17525b9..7e6db8c 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 - 2024-01-13 - + 2025-05-24 + 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 7edf112..268ef6e 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 - 2024-01-13 - + 2025-05-24 + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/docs/developers/release-process.md b/docs/developers/release-process.md index ebb0ef0..d005832 100644 --- a/docs/developers/release-process.md +++ b/docs/developers/release-process.md @@ -19,7 +19,7 @@ few manual steps. ### Create branch, PR and merge 1. Create a new branch (e.g. `release-1.2.3`) -2. Create a new PR +2. Commit the changed files and create a new PR 3. When everything's green: merge the PR ## Create new release on GitHub diff --git a/meson.build b/meson.build index a38a9e8..d8bc729 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.9.0', + version: '0.10.0', meson_version: '>= 0.55', license: 'GPL-2.0-or-later', default_options: [ 'warning_level=2' ]) diff --git a/new_release.sh b/new_release.sh index 20933bc..6135061 100755 --- a/new_release.sh +++ b/new_release.sh @@ -72,8 +72,10 @@ echo "$new_release" | sed -i "//r /dev/stdin" \ # CHANGELOG.md new_changelog=" -## $NEW_VERSION - $DATE_FULL" +## [$NEW_VERSION] - $DATE_FULL" echo "$new_changelog" | sed -i "/^## Unreleased$/r /dev/stdin" \ CHANGELOG.md echo "Changes done." +echo +echo "Don't forget to add the compare link in CHANGELOG.md." diff --git a/utils/book2manual.xsl b/utils/book2manual.xsl index ba9308c..4e0e254 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,9 +1,9 @@ - + - + ]>