Skip to content

Commit

Permalink
Merge pull request #159 from MightyCreak/prepare-release-0.7.5
Browse files Browse the repository at this point in the history
Prepare files for new release: 0.7.5
  • Loading branch information
MightyCreak authored Apr 15, 2022
2 parents c48ed95 + 399fb9b commit b1567bb
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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
## 0.7.5 - 2022-04-15

### Added
- Documentation: added release process instructions
Expand Down
17 changes: 17 additions & 0 deletions data/io.github.mightycreak.Diffuse.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,23 @@
<update_contact>romain.failliot@foolstep.com</update_contact>

<releases>
<release version="0.7.5" date="2022-04-15">
<description>
<p>
Crashfix and French translation.
</p>
<p>Added:</p>
<ul>
<li>Documentation: added release process instructions</li>
<li>Translation: added French translation</li>
</ul>
<p>Fixed:</p>
<ul>
<li>Fixed #156: Preferences cannot be saved in latest release</li>
<li>Cleanups: use constructors instead of `new()` whenever possible in GTK classes</li>
</ul>
</description>
</release>
<release version="0.7.4" date="2022-04-03">
<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.4">
<!ENTITY app-version "0.7.5">
<!ENTITY app-year "2006-2022">
<!ENTITY manual-year "2009-2022">
]>
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.4">
<!ENTITY app-version "0.7.5">
<!ENTITY app-year "2006-2022">
<!ENTITY manual-year "2009-2022">
]>
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.4">
<!ENTITY app-version "0.7.5">
<!ENTITY app-year "2006-2022">
<!ENTITY manual-year "2009-2022">
]>
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.4">
<!ENTITY app-version "0.7.5">
<!ENTITY app-year "2006-2022">
<!ENTITY manual-year "2009-2022">
]>
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>2022-04-03</date>
<version identifier="0.7.4" date="2022-04-03"/>
<version identifier="0.7.5" date="2022-04-15"/>
<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>2022-04-03</date>
<version identifier="0.7.4" date="2022-04-03"/>
<version identifier="0.7.5" date="2022-04-03"/>
<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>2022-04-03</date>
<version identifier="0.7.4" date="2022-04-03"/>
<version identifier="0.7.5" date="2022-04-03"/>
<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>2022-04-03</date>
<version identifier="0.7.4" date="2022-04-03"/>
<date>2022-04-15</date>
<version identifier="0.7.5" date="2022-04-15"/>
<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.4',
version: '0.7.5',
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.4">
<!ENTITY app-version "0.7.5">
<!ENTITY app-cmd "diffuse">
<!ENTITY date "2022-04-03">
<!ENTITY date "2022-04-15">
]>
<!--
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.4'
VERSION = '0.7.5'
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.4
AppVerName=Diffuse 0.7.5
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"
#define MyAppGroupName "Diffuse"
#define MyAppVersion "0.7.4"
#define MyAppVersion "0.7.5"
#define MyAppPublisher "Diffuse Team"
#define MyAppURL "https://github.com/MightyCreak/diffuse/"
#define MyAppExeName "diffuse.exe"
Expand Down

0 comments on commit b1567bb

Please sign in to comment.