From d4c39264de4cab5e60dd2208dbc821f7431a16c0 Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Thu, 25 Jan 2024 11:14:23 +0000
Subject: [PATCH] Preparing for release v2.2

---
 NEWS                               | 19 +++++++++++++++++++
 doc/docbook/CommandLineOptions.xml |  8 ++++----
 geeqie.1                           |  6 +++---
 org.geeqie.Geeqie.appdata.xml.in   |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index 1a94b493..39feba1f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+Geeqie 2.2
+============
+
+- Enhanced debug output with -Ddevel=enabled option
+- GitHub workflows for code tests and AppImage building
+- Modify Collections user interface
+- Remote keyboard actions
+- Allow .desktop files to be linked to programmable mouse buttons
+- Option to show-hide selectable bars
+- On exit additional check for multiple windows open
+- Plugin to resize an image
+- Include a separator as a toolbar option
+- Change all .desktop files to RDNS style
+- GTK "Open With" feature menu option
+- Reduce the height of toolbars
+- Option to select "hamburger" menu style
+- More progress in GTK4 migration
+- Many bug fixes
+
 Geeqie 2.1
 ============
 
diff --git a/doc/docbook/CommandLineOptions.xml b/doc/docbook/CommandLineOptions.xml
index fb7adecd..786c081f 100644
--- a/doc/docbook/CommandLineOptions.xml
+++ b/doc/docbook/CommandLineOptions.xml
@@ -7,8 +7,8 @@
 <refmeta>
 <refentrytitle>GEEQIE</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>October 2023</refmiscinfo>
-<refmiscinfo class='manual'>Geeqie 2.1+git20231026-2338cf60 GTK3</refmiscinfo>
+<refmiscinfo class='source'>January 2024</refmiscinfo>
+<refmiscinfo class='manual'>Geeqie 2.2 GTK3</refmiscinfo>
 </refmeta>
 <refnamediv>
 <refname>Geeqie</refname>
@@ -30,7 +30,7 @@ zooming, panning, thumbnails and sorting images into collections.</para>
 
 <para>Generated for version:</para>
 
-<para>Geeqie 2.1+git20231026-2338cf60</para>
+<para>Geeqie 2.2</para>
 
 <refsect2 id='valid_options'><title>Valid options:</title>
 <variablelist remap='TP'>
@@ -482,7 +482,7 @@ can be used to modify this behavior on an individual basis e.g.</para>
 </refsect1>
 
 <refsect1 id='copyright'><title>COPYRIGHT</title>
-<para>Copyright (C) 1999-2004 by John Ellis. Copyright (C) 2004-2023 by The Geeqie Team. Use this software  at  your
+<para>Copyright (C) 1999-2004 by John Ellis. Copyright (C) 2004-2024 by The Geeqie Team. Use this software  at  your
 own  risk! This  software released under the GNU General Public License. Please read the COPYING file for more
 information.</para>
 </refsect1>
diff --git a/geeqie.1 b/geeqie.1
index 502776fd..53088f5e 100644
--- a/geeqie.1
+++ b/geeqie.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH GEEQIE "1" "October 2023" "Geeqie 2.1+git20231026-2338cf60 GTK3" "User Commands"
+.TH GEEQIE "1" "January 2024" "Geeqie 2.2 GTK3" "User Commands"
 .SH NAME
 Geeqie - GTK based multiformat image viewer
 .SH SYNOPSIS
@@ -11,7 +11,7 @@ zooming, panning, thumbnails and sorting images into collections.
 
 Generated for version:
 .PP
-Geeqie 2.1+git20231026\-2338cf60
+Geeqie 2.2
 .SS "Valid options:"
 .TP
 \fB\-\-blank\fR
@@ -239,7 +239,7 @@ The name of a collection, with or without either path or extension (.gqv) may be
 .SH BUGS
 Please send bug reports and feedback to https://github.com/BestImageViewer/geeqie/issues
 .SH COPYRIGHT
-Copyright (C) 1999-2004 by John Ellis. Copyright (C) 2004-2023 by The Geeqie Team. Use this software  at  your
+Copyright (C) 1999-2004 by John Ellis. Copyright (C) 2004-2024 by The Geeqie Team. Use this software  at  your
 own  risk! This  software released under the GNU General Public License. Please read the COPYING file for more
 information.
 .SH "SEE ALSO"
diff --git a/org.geeqie.Geeqie.appdata.xml.in b/org.geeqie.Geeqie.appdata.xml.in
index ffc8c534..a6a663de 100644
--- a/org.geeqie.Geeqie.appdata.xml.in
+++ b/org.geeqie.Geeqie.appdata.xml.in
@@ -21,7 +21,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="v2.1" date="2023-06-17" />
+    <release version="v2.2" date="2024-01-25" />
   </releases>
   <keywords>
     <keyword>image</keyword>
-- 
2.20.1