Merge pull request #209 from MightyCreak/release-0.8.2

MightyCreak · web-flow · commit c0cefac1c4ab · 2023-04-16T13:38:53.000-04:00
release: new release 0.8.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 0.8.2 - 2023-04-16
+
 ### Added
 
 - Add link to the Matrix room in the README (@MightyCreak)
diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in
@@ -37,6 +37,29 @@
   <update_contact>romain@foolstep.com</update_contact>
 
   <releases>
+    <release version="0.8.2" date="2023-04-16">
+      <description>
+        <p>Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.</p>
+        <p>Added:</p>
+        <ul>
+          <li>Add link to the Matrix room in the README (@MightyCreak)</li>
+          <li>Add Dutch translation (@Vistaus)</li>
+        </ul>
+        <p>Changed:</p>
+        <ul>
+          <li>Replace `_` by `-` in the action names to be compatible with GTK action names (@MightyCreak)</li>
+          <li>The About dialog is now transient for the main window (@oscfdezdz)</li>
+          <li>Remove deprecated STOCK constants and use more modern, symbolic icons (@oscfdezdz)</li>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Some signals weren't properly renamed from the previous GTK3 migration (@MightyCreak)</li>
+          <li>The syntax menu wasn't working anymore (@MightyCreak)</li>
+          <li>Properly handles SIGINT (i.e. Ctrl+C) now (@MightyCreak)</li>
+          <li>Add back `save_state()` to remember window's width and height (@MightyCreak)</li>
+        </ul>
+      </description>
+    </release>
     <release version="0.8.1" date="2023-04-07">
       <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.8.1">
+  <!ENTITY app-version "0.8.2">
   <!ENTITY app-year "2006-2023">
   <!ENTITY manual-year "2009-2023">
 ]>
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.8.1">
+  <!ENTITY app-version "0.8.2">
   <!ENTITY app-year "2006-2023">
   <!ENTITY manual-year "2009-2023">
 ]>
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.8.1">
+  <!ENTITY app-version "0.8.2">
   <!ENTITY app-year "2006-2023">
   <!ENTITY manual-year "2009-2023">
 ]>
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.8.1">
+  <!ENTITY app-version "0.8.2">
   <!ENTITY app-year "2006-2023">
   <!ENTITY manual-year "2009-2023">
 ]>
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>2023-04-07</date>
-    <version identifier="0.8.1" date="2023-04-07"/>
+    <date>2023-04-16</date>
+    <version identifier="0.8.2" date="2023-04-16"/>
     <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>2023-04-07</date>
-    <version identifier="0.8.1" date="2023-04-07"/>
+    <date>2023-04-16</date>
+    <version identifier="0.8.2" date="2023-04-16"/>
     <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>2023-04-07</date>
-    <version identifier="0.8.1" date="2023-04-07"/>
+    <date>2023-04-16</date>
+    <version identifier="0.8.2" date="2023-04-16"/>
     <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>2023-04-07</date>
-    <version identifier="0.8.1" date="2023-04-07"/>
+    <date>2023-04-16</date>
+    <version identifier="0.8.2" date="2023-04-16"/>
     <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
@@ -9,11 +9,11 @@ few manual steps.
 
 1. Find the next version, using semantic versioning (e.g. `1.2.3`), depending on
    the changes in the changelog
-2. Execute `./new_release NEW_VERSION` (replace `NEW_VERSION` with the new version)
-3. Update the AppData release notes in data/io.github.mightycreak.Diffuse.appdata.xml.in:
-   - Look for the empty `<p>` tag under the new `<release>` tag
-   - Add a paragraph to sum the release in one sentence (e.g. highlights, ...)
-   - Paste the changes from CHANGELOG.md and adapt it to HTML (see other
+2. Execute `./new_release.sh NEW_VERSION` (replace `NEW_VERSION` with the new version)
+3. Update the AppData release notes in `data/io.github.mightycreak.Diffuse.appdata.xml.in`:
+   - Look for the `<description>` tag under the new `<release>` tag
+   - Sum the release in one sentence in the `<p>` tag (e.g. highlights, ...)
+   - Paste the changes from CHANGELOG.md, and adapt it to HTML (see other
      releases in the file)
 
 ### Create branch, PR and merge
@@ -25,7 +25,8 @@ few manual steps.
 ## Create new release on GitHub
 
 1. Create a new release on GitHub's [new release page](https://github.com/MightyCreak/diffuse/releases/new):
-   - Choose a tag: `v` followed with the new version (e.g. `v1.2.3`)
+   - Release tag: Enter `v` followed with the new version (e.g. `v1.2.3`) and
+     create the tag
    - Release title: the tag (e.g. `v1.2.3`)
    - Description:
      - For the first paragraph, paste the first paragraph from the release notes
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('diffuse',
-    version: '0.8.1',
+    version: '0.8.2',
     meson_version: '>= 0.55',
     license: 'GPL-2.0-or-later',
     default_options: [ 'warning_level=2' ])
diff --git a/new_release.sh b/new_release.sh
@@ -31,7 +31,7 @@ DATE_YEAR=$(date +%Y)
 echo "Changing files for new version $NEW_VERSION..."
 
 # meson.build
-sed -i -E "s/version: '.+?',/version: '$NEW_VERSION',/" \
+sed -i -E "s/\bversion: '.+?',/version: '$NEW_VERSION',/" \
     meson.build
 
 # GNOME help (.xml and .omf)
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.8.1">
+ <!ENTITY app-version "0.8.2">
  <!ENTITY app-cmd "diffuse">
- <!ENTITY date "2023-04-07">
+ <!ENTITY date "2023-04-16">
 ]>
 <!--
   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.8.1'
+VERSION = '0.8.2'
 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.8.1
+AppVerName=Diffuse 0.8.2
 DefaultDirName={pf}\Diffuse
 DefaultGroupName=Diffuse
 UninstallDisplayIcon={app}\diffusew.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.8.1">`
	`5`	`+ <!ENTITY app-version "0.8.2">`
`6`	`6`	`<!ENTITY app-year "2006-2023">`
`7`	`7`	`<!ENTITY manual-year "2009-2023">`
`8`	`8`	`]>`