Merge pull request #168 from MightyCreak/prepare-release-0.7.6

MightyCreak · web-flow · commit 9fd76e30cb63 · 2022-10-23T17:20:06.000-04:00
Prepare files for new release 0.7.6
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in
@@ -25,9 +25,30 @@
 
   <!-- Translators: no need to translate after this comment -->
   <developer_name>Romain Failliot</developer_name>
-  <update_contact>romain.failliot@foolstep.com</update_contact>
+  <update_contact>romain@foolstep.com</update_contact>
 
   <releases>
+    <release version="0.7.6" date="2022-10-23">
+      <description>
+        <p>
+          Add port to Mac OS..
+        </p>
+        <p>Added:</p>
+        <ul>
+          <li>Port to Mac OS (thanks to @hugoholgersson)</li>
+        </ul>
+        <p>Changed:</p>
+        <ul>
+          <li>Documentation: added dev setup for MacOS</li>
+          <li>Documentation: updated the dependencies</li>
+          <li>CI/CD: GitHub actions warnings</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Fixed MyPy errors</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.7.5" date="2022-04-15">
       <description>
         <p>
diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/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.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/data/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.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/data/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.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>
diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/data/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.7.5">
+  <!ENTITY app-version "0.7.6">
   <!ENTITY app-year "2006-2022">
   <!ENTITY manual-year "2009-2022">
 ]>
diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/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>2022-04-15</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <date>2022-10-23</date>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse is a graphical tool for merging and comparing text files.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/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>2022-04-15</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <date>2022-10-23</date>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <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>
diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/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>2022-04-15</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <date>2022-10-23</date>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Diffuse è uno strumento grafico per l'unione e il confronto di file di testo.</description>
     <type>manual</type>
diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf
@@ -4,8 +4,8 @@
     <creator>Derrick Moser</creator>
     <maintainer>Derrick Moser</maintainer>
     <title>Руководство Пользователя Diffuse</title>
-    <date>2022-04-15</date>
-    <version identifier="0.7.5" date="2022-04-15"/>
+    <date>2022-10-23</date>
+    <version identifier="0.7.6" date="2022-10-23"/>
     <subject category="GNOME|Development|Applications"/>
     <description>Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов.</description>
     <type>manual</type>
diff --git a/docs/developers/release-process.md b/docs/developers/release-process.md
@@ -26,7 +26,8 @@ few manual steps.
    - Create a new `<release>` tag under `<releases>`, fill the `version` and
      `date` attributes
    - Create a new `<description>` tag under the new `<release>` tag
-   - Add one paragraph to sum the release in one sentence (e.g. highlights, ...)
+   - Add a paragraph (`<p>`) to sum the release in one sentence (e.g.
+     highlights, ...)
    - Paste the changes from the changelog and adapt it to HTML
 6. Create new branch and PR
 
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('diffuse',
-    version: '0.7.5',
+    version: '0.7.6',
     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
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE xsl:stylesheet [
  <!ENTITY app "Diffuse">
- <!ENTITY app-version "0.7.5">
+ <!ENTITY app-version "0.7.6">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2022-04-15">
+ <!ENTITY date "2022-10-23">
 ]>
 <!--
   template for translating Diffuse's help documentation to a manual page
diff --git a/windows-installer/build.py b/windows-installer/build.py
@@ -25,7 +25,7 @@
 import subprocess
 import sys
 
-VERSION = '0.7.5'
+VERSION = '0.7.6'
 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
@@ -5,7 +5,7 @@
 [Setup]
 AppId=Diffuse
 AppName={cm:ToolName}
-AppVerName=Diffuse 0.7.5
+AppVerName=Diffuse 0.7.6
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.exe
diff --git a/windows-installer/diffuse.new.iss b/windows-installer/diffuse.new.iss
@@ -4,7 +4,7 @@
 
 #define MyAppName "Diffuse"
 #define MyAppGroupName "Diffuse"
-#define MyAppVersion "0.7.5"
+#define MyAppVersion "0.7.6"
 #define MyAppPublisher "Diffuse Team"
 #define MyAppURL "https://github.com/MightyCreak/diffuse/"
 #define MyAppExeName "diffuse.exe"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"`
`3`	`3`	`[`
`4`	`4`	`<!ENTITY app "Diffuse">`
`5`		`- <!ENTITY app-version "0.7.5">`
	`5`	`+ <!ENTITY app-version "0.7.6">`
`6`	`6`	`<!ENTITY app-year "2006-2022">`
`7`	`7`	`<!ENTITY manual-year "2009-2022">`
`8`	`8`	`]>`