From 5afe192966af5d973fead33291b287a452c31519 Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Wed, 17 Nov 2021 19:23:22 -0500 Subject: [PATCH] New release v0.7.1 --- CHANGELOG.md | 4 ++++ data/io.github.mightycreak.Diffuse.metainfo.xml.in | 14 ++++++++++++++ data/usr/share/gnome/help/diffuse/C/diffuse.xml | 2 +- data/usr/share/gnome/help/diffuse/cs/diffuse.xml | 2 +- data/usr/share/gnome/help/diffuse/it/diffuse.xml | 2 +- data/usr/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 | 2 +- windows-installer/build.py | 2 +- windows-installer/diffuse.iss | 2 +- windows-installer/diffuse.new.iss | 2 +- 15 files changed, 35 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4950b..b834652 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +### Fixed + +## [0.7.1] + ### Fixed - Fixed #103: the flatpak app can now call binaries on the host, such as `git`, `svn`, etc. (PR #105) diff --git a/data/io.github.mightycreak.Diffuse.metainfo.xml.in b/data/io.github.mightycreak.Diffuse.metainfo.xml.in index 0841d45..04390f7 100644 --- a/data/io.github.mightycreak.Diffuse.metainfo.xml.in +++ b/data/io.github.mightycreak.Diffuse.metainfo.xml.in @@ -21,6 +21,20 @@ + + +

+ Patch release to fix a bug when using the Flatpak package. +

+

Fixed:

+
    +
  • + Fixed a Flatpak bug where the app couldn't call binaries on the + host, such as `git`, `svn`, etc. +
    • +
+ +

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index 6b67c8b..09663c7 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 3d5b96c..e119dc1 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 88f73e2..50ad2f4 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 a507b4a..5d451bc 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 5085741..74a476d 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 - 2021-11-16 - + 2021-11-17 + 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 13cd13e..8c61be6 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 - 2021-11-16 - + 2021-11-17 + 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 26cf3fa..e2e9cc1 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 - 2021-11-16 - + 2021-11-17 + 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 d032b71..4ace84b 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 - 2021-11-16 - + 2021-11-17 + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/meson.build b/meson.build index 2545b38..115b006 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.7.0', + version: '0.7.1', meson_version: '>= 0.50', license: 'GPL-2.0-or-later', default_options: [ 'warning_level=2' ]) diff --git a/utils/book2manual.xsl b/utils/book2manual.xsl index 4e2459d..a10c213 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,7 +1,7 @@ - + ]> diff --git a/windows-installer/build.py b/windows-installer/build.py index b450949..51b4aff 100755 --- a/windows-installer/build.py +++ b/windows-installer/build.py @@ -25,7 +25,7 @@ import platform import subprocess import sys -VERSION='0.7.0' +VERSION='0.7.1' PACKAGE='1' PLATFORM='win' + ''.join([ c for c in platform.architecture()[0] if c.isdigit() ]) INSTALLER='diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM) diff --git a/windows-installer/diffuse.iss b/windows-installer/diffuse.iss index 41b268e..993f648 100644 --- a/windows-installer/diffuse.iss +++ b/windows-installer/diffuse.iss @@ -5,7 +5,7 @@ [Setup] AppId=Diffuse AppName={cm:ToolName} -AppVerName=Diffuse 0.7.0 +AppVerName=Diffuse 0.7.1 DefaultDirName={pf}\Diffuse DefaultGroupName=Diffuse UninstallDisplayIcon={app}\diffusew.exe diff --git a/windows-installer/diffuse.new.iss b/windows-installer/diffuse.new.iss index 258a9bd..fb36800 100644 --- a/windows-installer/diffuse.new.iss +++ b/windows-installer/diffuse.new.iss @@ -4,7 +4,7 @@ #define MyAppName "Diffuse Merge Tool" #define MyAppGroupName "Diffuse" -#define MyAppVersion "0.7.0" +#define MyAppVersion "0.7.1" #define MyAppPublisher "Diffuse Team" #define MyAppURL "https://github.com/MightyCreak/diffuse/" #define MyAppExeName "diffuse.exe"