Skip to content

Commit

Permalink
Merge pull request #113 from MightyCreak/new-release-0.7.2
Browse files Browse the repository at this point in the history
Bump version to 0.7.2
  • Loading branch information
MightyCreak authored Nov 18, 2021
2 parents dde7ace + 336801f commit cf1d2a0
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 15 deletions.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

### Changed

### Fixed

## [0.7.2] - 2021-11-18

### Added
- New options: log_print_output and log_print_stack, to print the log messages
on the output and code stack
Expand Down Expand Up @@ -331,7 +339,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- initial public release

[Unreleased]: https://github.com/MightyCreak/diffuse/compare/v0.7.1...HEAD
[Unreleased]: https://github.com/MightyCreak/diffuse/compare/v0.7.2...HEAD
[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
Expand Down
28 changes: 28 additions & 0 deletions data/io.github.mightycreak.Diffuse.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,34 @@
</screenshot>
</screenshots>
<releases>
<release version="0.7.2" date="2021-11-18">
<description>
<p>
Patch release that fixes an error about APP_NAME and the Brazilian translation.
</p>
<p>Added:</p>
<ul>
<li>
New options: log_print_output and log_print_stack, to print the log
messages on the output and code stack
</li>
<li>
New log function: utils.logErrorAndDialog, to both log and show a
dialog message
</li>
</ul>
<p>Changed:</p>
<ul>
<li>Modularized the VCSs (reducing main.py by around 1300 lines)</li>
<li>Bump GNOME runtime version from 3.38 to 41</li>
</ul>
<p>Fixed:</p>
<ul>
<li>Fixed 'APP_NAME' error when opening non existing file</li>
<li>Fixed the Portuguese Brazilian (pt_BR) translation</li>
</ul>
</description>
</release>
<release version="0.7.1" date="2021-11-17">
<description>
<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.7.1">
<!ENTITY app-version "0.7.2">
<!ENTITY app-year "2006-2021">
<!ENTITY manual-year "2009-2021">
]>
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.7.1">
<!ENTITY app-version "0.7.2">
<!ENTITY app-year "2006-2021">
<!ENTITY manual-year "2009-2021">
]>
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.7.1">
<!ENTITY app-version "0.7.2">
<!ENTITY app-year "2006-2021">
<!ENTITY manual-year "2009-2021">
]>
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.7.1">
<!ENTITY app-version "0.7.2">
<!ENTITY app-year "2006-2021">
<!ENTITY manual-year "2009-2021">
]>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/omf/diffuse/diffuse-C.omf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<maintainer>Derrick Moser</maintainer>
<title>Diffuse User's Manual</title>
<date>2021-11-17</date>
<version identifier="0.7.1" date="2021-11-17"/>
<version identifier="0.7.2" date="2021-11-18"/>
<subject category="GNOME|Development|Applications"/>
<description>Diffuse is a graphical tool for merging and comparing text files.</description>
<type>manual</type>
Expand Down
2 changes: 1 addition & 1 deletion data/usr/share/omf/diffuse/diffuse-cs.omf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<maintainer>Derrick Moser</maintainer>
<title>Uživatelská příručka programu Diffuse</title>
<date>2021-11-17</date>
<version identifier="0.7.1" date="2021-11-17"/>
<version identifier="0.7.2" date="2021-11-18"/>
<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
2 changes: 1 addition & 1 deletion data/usr/share/omf/diffuse/diffuse-it.omf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<maintainer>Derrick Moser</maintainer>
<title>Manuale utente di Diffuse</title>
<date>2021-11-17</date>
<version identifier="0.7.1" date="2021-11-17"/>
<version identifier="0.7.2" date="2021-11-18"/>
<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
2 changes: 1 addition & 1 deletion data/usr/share/omf/diffuse/diffuse-ru.omf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<maintainer>Derrick Moser</maintainer>
<title>Руководство Пользователя Diffuse</title>
<date>2021-11-17</date>
<version identifier="0.7.1" date="2021-11-17"/>
<version identifier="0.7.2" date="2021-11-18"/>
<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.7.1',
version: '0.7.2',
meson_version: '>= 0.50',
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.7.1">
<!ENTITY app-version "0.7.2">
<!ENTITY app-cmd "diffuse">
<!ENTITY date "2021-11-16">
<!ENTITY date "2021-11-18">
]>
<!--
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.7.1'
VERSION='0.7.2'
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.7.1
AppVerName=Diffuse 0.7.2
DefaultDirName={pf}\Diffuse
DefaultGroupName=Diffuse
UninstallDisplayIcon={app}\diffusew.exe
Expand Down
2 changes: 1 addition & 1 deletion windows-installer/diffuse.new.iss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#define MyAppName "Diffuse Merge Tool"
#define MyAppGroupName "Diffuse"
#define MyAppVersion "0.7.1"
#define MyAppVersion "0.7.2
#define MyAppPublisher "Diffuse Team"
#define MyAppURL "https://github.com/MightyCreak/diffuse/"
#define MyAppExeName "diffuse.exe"
Expand Down

0 comments on commit cf1d2a0

Please sign in to comment.