Merge pull request #71 from MightyCreak/v0.6.0

Set up files for 0.6.0

CHANGELOG.md

@@ -8,14 +8,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+### Changed
+
+### Fixed
+
+## [0.6.0] - 2020-11-29
+
+### Added
+- New Flatpak package, published on Flathub: com.github.mightycreak.Diffuse
+
 ### Changed
 - Replace old install.py with the more standard Meson
 - Remove `u` string prefixes since Python 3 is in UTF-8 by default
 - Replaced some interpolation operators (`%`) for the `f` string prefix
 - Use the window scale factor for the icons generation
 
-### Fixed
-
 ## [0.5.0] - 2020-07-18
 ### Added
 - added Pedro Albuquerque's Portuguese translation
@@ -290,7 +297,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.5.0...HEAD
+[Unreleased]: https://github.com/MightyCreak/diffuse/compare/v0.6.0...HEAD
+[0.6.0]: https://github.com/MightyCreak/diffuse/compare/v0.6.0...v0.5.0
 [0.5.0]: https://github.com/MightyCreak/diffuse/compare/v0.4.8...v0.5.0
 [0.4.8]: https://github.com/MightyCreak/diffuse/compare/v0.4.7...v0.4.8
 [0.4.7]: https://github.com/MightyCreak/diffuse/compare/v0.4.6...v0.4.7

README.md

@@ -1,7 +1,5 @@
 # Diffuse
 
-Version 0.5.0
-
 Copyright (C) 2006-2019 Derrick Moser <derrick_moser@yahoo.com>  
 Copyright (C) 2015-2020 Romain Failliot <romain.failliot@foolstep.com>
 

com.github.mightycreak.Diffuse.yml

@@ -14,6 +14,6 @@ modules:
     sources:
       - type: git
         url: https://github.com/MightyCreak/diffuse
-        branch: master
+        branch: v0.6.0
 rename-desktop-file: diffuse.desktop
 rename-icon: diffuse

src/usr/bin/diffuse.py.in

@@ -65,7 +65,7 @@ gettext.textdomain('diffuse')
 _ = gettext.gettext
 
 APP_NAME = 'Diffuse'
-VERSION = '0.5.0'
+VERSION = '0.6.0'
 COPYRIGHT =  '''{copyright} © 2006-2019 Derrick Moser
 {copyright} © 2015-2020 Romain Failliot'''.format(copyright=_("Copyright"))
 WEBSITE = 'https://github.com/MightyCreak/diffuse'

src/usr/share/gnome/help/diffuse/C/diffuse.xml

@@ -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.5.0">
+  <!ENTITY app-version "0.6.0">
   <!ENTITY app-year "2006-2020">
   <!ENTITY manual-year "2009-2020">
 ]>

src/usr/share/gnome/help/diffuse/cs/diffuse.xml

@@ -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.5.0">
+  <!ENTITY app-version "0.6.0">
   <!ENTITY app-year "2006-2020">
   <!ENTITY manual-year "2009-2020">
 ]>

src/usr/share/gnome/help/diffuse/it/diffuse.xml

@@ -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.5.0">
+  <!ENTITY app-version "0.6.0">
   <!ENTITY app-year "2006-2020">
   <!ENTITY manual-year "2009-2020">
 ]>

src/usr/share/gnome/help/diffuse/ru/diffuse.xml

@@ -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.5.0">
+  <!ENTITY app-version "0.6.0">
   <!ENTITY app-year "2006-2020">
   <!ENTITY manual-year "2009-2020">
 ]>

src/usr/share/omf/diffuse/diffuse-C.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Diffuse User's Manual</title>
-    <date>2020-07-18</date>
+    <date>2020-11-29</date>
-    <version identifier="0.5.0" date="2020-07-18"/>
+    <version identifier="0.6.0" date="2020-11-29"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>

src/usr/share/omf/diffuse/diffuse-cs.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Uživatelská příručka programu Diffuse</title>
-    <date>2020-07-18</date>
+    <date>2020-11-29</date>
-    <version identifier="0.5.0" date="2020-07-18"/>
+    <version identifier="0.6.0" date="2020-11-29"/>
     <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>

src/usr/share/omf/diffuse/diffuse-it.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Manuale utente di Diffuse</title>
-    <date>2020-07-18</date>
+    <date>2020-11-29</date>
-    <version identifier="0.5.0" date="2020-07-18"/>
+    <version identifier="0.6.0" date="2020-11-29"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
     <type>manual</type>

src/usr/share/omf/diffuse/diffuse-ru.omf

@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
-    <date>2020-07-18</date>
+    <date>2020-11-29</date>
-    <version identifier="0.5.0" date="2020-07-18"/>
+    <version identifier="0.6.0" date="2020-11-29"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>

utils/book2manual.xsl

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.5.0">
+ <!ENTITY app-version "0.6.0">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2020-07-18">
+ <!ENTITY date "2020-11-29">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page

windows-installer/build.py

@@ -25,7 +25,7 @@ import platform
 import subprocess
 import sys
 
-VERSION='0.5.0'
+VERSION='0.6.0'
 PACKAGE='1'
 PLATFORM='win' + ''.join([ c for c in platform.architecture()[0] if c.isdigit() ])
 INSTALLER='diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM)

windows-installer/diffuse.iss

@@ -5,7 +5,7 @@
 [Setup]
 AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.5.0
+AppVerName=Diffuse 0.6.0
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe

windows-installer/diffuse.new.iss

@@ -4,7 +4,7 @@
 
 #define MyAppName "Diffuse Merge Tool"
 #define MyAppGroupName "Diffuse"
-#define MyAppVersion "0.5.0"
+#define MyAppVersion "0.6.0"
 #define MyAppPublisher "Diffuse Team"
 #define MyAppURL "https://github.com/MightyCreak/diffuse/"
 #define MyAppExeName "diffuse.exe"