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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
18 changes: 18 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,24 @@
<update_contact>romain@foolstep.com</update_contact>

<releases>
<release version="0.11.0" date="2026-03-12">
<description>
<p>Summary: allow multiple `-r` flags in command-line, update to GNOME 49.</p>
<p>Changed:</p>
<ul>
<li>Update release process documentation (@MightyCreak)</li>
<li>Minimal Pytnon release is now 3.10 (@MightyCreak)</li>
<li>Update flatpak's GNOME runtime to 49 (@MightyCreak)</li>
<li>Update PyPi requirements (@MightyCreak)</li>
</ul>
<p>Fixed:</p>
<ul>
<li>fix(cicd): update Github CI/CD script (@MightyCreak)</li>
<li>Fix #246: Re-instate ability
to provide multiple revs eg diffuse -r v1 -r v2 file (@bhepple)</li>
</ul>
</description>
</release>
<release version="0.10.0" date="2025-05-24">
<description>
<p>Summary: update to GNOME 48, updated a few translations.</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.10.0">
<!ENTITY app-version "0.11.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.10.0">
<!ENTITY app-version "0.11.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.10.0">
<!ENTITY app-version "0.11.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.10.0">
<!ENTITY app-version "0.11.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>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<date>2026-03-12</date>
<version identifier="0.11.0" date="2026-03-12"/>
<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>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<date>2026-03-12</date>
<version identifier="0.11.0" date="2026-03-12"/>
<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>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<date>2026-03-12</date>
<version identifier="0.11.0" date="2026-03-12"/>
<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>2025-05-24</date>
<version identifier="0.10.0" date="2025-05-24"/>
<date>2026-03-12</date>
<version identifier="0.11.0" date="2026-03-12"/>
<subject category="GNOME|Development|Applications"/>
<description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
<type>manual</type>
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.10.0',
version: '0.11.0',
meson_version: '>= 0.55',
license: 'GPL-2.0-or-later',
default_options: [ 'warning_level=2' ])
Expand Down
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.10.0">
<!ENTITY app-version "0.11.0">
<!ENTITY app-cmd "diffuse">
<!ENTITY date "2025-05-24">
<!ENTITY date "2026-03-12">
]>
<!--
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.10.0'
VERSION = '0.11.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.10.0
AppVerName=Diffuse 0.11.0
DefaultDirName={pf}\Diffuse
DefaultGroupName=Diffuse
UninstallDisplayIcon={app}\diffusew.exe
Expand Down
Loading