Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 34 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -110,15 +114,15 @@ 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

- Translation: updated Spanish translation (@oscfdezdz)
- 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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
22 changes: 22 additions & 0 deletions data/io.github.mightycreak.Diffuse.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,28 @@
<update_contact>[email protected]</update_contact>

<releases>
<release version="0.10.0" date="2025-05-24">
<description>
<p>Summary: update to GNOME 48, updated a few translations.</p>
<p>Changed:</p>
<ul>
<li>Translation: update French translation (@WedoneOfficiel)</li>
<li>Translation: update Italian translation (@albanobattistella)</li>
<li>Translation: update Portuguese translation (@hugok79)</li>
<li>Translation: update Brazilian Portuguese translation (@johnpetersa19)</li>
<li>Translation: add 'nl' in LINGUAS (@hugok79)</li>
<li>Update pypi packages (@MightyCreak)</li>
<li>Add pre-commit git hooks to run linters (@MightyCreak)</li>
<li>Docs: improve devs setup structure (@MightyCreak)</li>
<li>Update to flatpak's GNOME runtime 48 (@MightyCreak)</li>
</ul>
<p>Fixed:</p>
<ul>
<li>Docs: fix incorrect flatpak command to install runtime SDK (@MightyCreak)</li>
<li>Update GitHub actions: use Ubuntu 24.04, Python 3.9 and new Flatpak image (@MightyCreak)</li>
</ul>
</description>
</release>
<release version="0.9.0" date="2024-01-13">
<description>
<p>Summary: remove support for SVK, update to GNOME 45, updated Turkish translation.</p>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/gnome/help/diffuse/C/diffuse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY app "Diffuse">
<!ENTITY app-version "0.9.0">
<!ENTITY app-version "0.10.0">
<!ENTITY app-year "2006-2023">
<!ENTITY manual-year "2009-2023">
]>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/gnome/help/diffuse/cs/diffuse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[
<!ENTITY app "Diffuse">
<!ENTITY app-version "0.9.0">
<!ENTITY app-version "0.10.0">
<!ENTITY app-year "2006-2023">
<!ENTITY manual-year "2009-2023">
]>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/gnome/help/diffuse/it/diffuse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY app "Diffuse">
<!ENTITY app-version "0.9.0">
<!ENTITY app-version "0.10.0">
<!ENTITY app-year "2006-2023">
<!ENTITY manual-year "2009-2023">
]>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/gnome/help/diffuse/ru/diffuse.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY app "Diffuse">
<!ENTITY app-version "0.9.0">
<!ENTITY app-version "0.10.0">
<!ENTITY app-year "2006-2023">
<!ENTITY manual-year "2009-2023">
]>
Expand Down
4 changes: 2 additions & 2 deletions data/usr/share/omf/diffuse/diffuse-C.omf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<creator>Derrick Moser</creator>
<maintainer>Derrick Moser</maintainer>
<title>Diffuse User's Manual</title>
<date>2024-01-13</date>
<version identifier="0.9.0" date="2024-01-13"/>
<date>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<subject category="GNOME|Development|Applications"/>
<description>Diffuse is a graphical tool for merging and comparing text files.</description>
<type>manual</type>
Expand Down
4 changes: 2 additions & 2 deletions data/usr/share/omf/diffuse/diffuse-cs.omf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<creator>Derrick Moser</creator>
<maintainer>Derrick Moser</maintainer>
<title>Uživatelská příručka programu Diffuse</title>
<date>2024-01-13</date>
<version identifier="0.9.0" date="2024-01-13"/>
<date>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<subject category="GNOME|Development|Applications"/>
<description>Diffuse je grafický nástroj pro slučování a porovnávání textových souborů.</description>
<type>manual</type>
Expand Down
4 changes: 2 additions & 2 deletions data/usr/share/omf/diffuse/diffuse-it.omf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<creator>Derrick Moser</creator>
<maintainer>Derrick Moser</maintainer>
<title>Manuale utente di Diffuse</title>
<date>2024-01-13</date>
<version identifier="0.9.0" date="2024-01-13"/>
<date>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<subject category="GNOME|Development|Applications"/>
<description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
<type>manual</type>
Expand Down
4 changes: 2 additions & 2 deletions data/usr/share/omf/diffuse/diffuse-ru.omf
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<creator>Derrick Moser</creator>
<maintainer>Derrick Moser</maintainer>
<title>Руководство Пользователя Diffuse</title>
<date>2024-01-13</date>
<version identifier="0.9.0" date="2024-01-13"/>
<date>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<subject category="GNOME|Development|Applications"/>
<description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
<type>manual</type>
Expand Down
2 changes: 1 addition & 1 deletion docs/developers/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -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' ])
Expand Down
4 changes: 3 additions & 1 deletion new_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ echo "$new_release" | sed -i "/<releases>/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."
4 changes: 2 additions & 2 deletions utils/book2manual.xsl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE xsl:stylesheet [
<!ENTITY app "Diffuse">
<!ENTITY app-version "0.9.0">
<!ENTITY app-version "0.10.0">
<!ENTITY app-cmd "diffuse">
<!ENTITY date "2024-01-13">
<!ENTITY date "2025-05-24">
]>
<!--
template for translating Diffuse's help documentation to a manual page
Expand Down
2 changes: 1 addition & 1 deletion windows-installer/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import subprocess
import sys

VERSION = '0.9.0'
VERSION = '0.10.0'
PACKAGE = '1'
PLATFORM = 'win' + ''.join([c for c in platform.architecture()[0] if c.isdigit()])
INSTALLER = 'diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)
Expand Down
2 changes: 1 addition & 1 deletion windows-installer/diffuse.iss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[Setup]
AppId=Diffuse
AppName={cm:ToolName}
AppVerName=Diffuse 0.9.0
AppVerName=Diffuse 0.10.0
DefaultDirName={pf}\Diffuse
DefaultGroupName=Diffuse
UninstallDisplayIcon={app}\diffusew.exe
Expand Down