From 6427df67c44ba969055b5dae32efe4a2cd466280 Mon Sep 17 00:00:00 2001
From: Jerome Flesch <jflesch@openpaper.work>
Date: Thu, 1 Feb 2018 22:53:01 +0100
Subject: [PATCH] 1.2.3

Signed-off-by: Jerome Flesch <jflesch@openpaper.work>
---
 ChangeLog                                            | 7 +++++++
 data/work.openpaper.Paperwork.appdata.xml            | 1 +
 setup.py                                             | 9 +++------
 src/paperwork/frontend/aboutdialog/aboutdialog.glade | 2 +-
 src/paperwork/frontend/mainwindow/__init__.py        | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78847620..36e2302b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018/02/01 - 1.2.3:
+- Flatpak: Fix support of other GTK themes (Dark Adwaita, etc)
+- French translations: shorten the translation of "Matching papers" because
+  otherwise it messes with the UI
+- Export dialog: Clicking on export->{document|page} a second time will first
+  close the first export dialog.
+
 2017/11/14 - 1.2.2:
 - DnD: Fix double-delete: when moving the last page of a document
   to another, don't delete the source document (it's up to the
diff --git a/data/work.openpaper.Paperwork.appdata.xml b/data/work.openpaper.Paperwork.appdata.xml
index 628088fc..bc2d3e4e 100644
--- a/data/work.openpaper.Paperwork.appdata.xml
+++ b/data/work.openpaper.Paperwork.appdata.xml
@@ -66,6 +66,7 @@
   <launchable type="desktop-id">work.openpaper.Paperwork.desktop</launchable>
 
   <releases>
+    <release version="1.2.3" date="2018-02-01" urgency="medium" />
     <release version="1.2.2" date="2017-11-14" urgency="medium" />
     <release version="1.2.1" date="2017-08-26" urgency="medium" />
   </releases>
diff --git a/setup.py b/setup.py
index 90e32e9d..3c4fa0c8 100755
--- a/setup.py
+++ b/setup.py
@@ -89,9 +89,6 @@
     # * update src/paperwork/frontend/mainwindow/__init__.py:__version__
     # * update the dependency version on paperwork-backend
     # * update data/work.openpaper.Paperwork.appdata.xml:<releases>
-    # * update the public key in
-    #   src/paperwork/frontend/activation/__init__.py:check_activation_key()
-    #   if required
     #
     # Release:
     # * commit
@@ -101,7 +98,7 @@
     # After the release:
     # * add a file flatpak/<version>.json
     # * update flatpak/release.json
-    version="1.2.2",
+    version="1.2.3",
     description=(
         "Using scanner and OCR to grep dead trees the easy way (Linux only)"
     ),
@@ -127,7 +124,7 @@
     keywords="scanner ocr gui",
     url="https://github.com/openpaperwork/paperwork",
     download_url=("https://github.com/openpaperwork/paperwork"
-                  "/archive/1.2.2.tar.gz"),
+                  "/archive/1.2.3.tar.gz"),
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: X11 Applications :: GTK",
@@ -166,7 +163,7 @@
         "pypillowfight",
         "pyxdg >= 0.25",
         "termcolor",  # used by paperwork-chkdeps
-        "paperwork-backend>=1.2.2,<1.3",
+        "paperwork-backend>=1.2.3,<1.3",
         # paperwork-chkdeps take care of all the dependencies that can't be
         # handled here. For instance:
         # - Dependencies using gobject introspection
diff --git a/src/paperwork/frontend/aboutdialog/aboutdialog.glade b/src/paperwork/frontend/aboutdialog/aboutdialog.glade
index 1c9797ba..3e2da5bf 100644
--- a/src/paperwork/frontend/aboutdialog/aboutdialog.glade
+++ b/src/paperwork/frontend/aboutdialog/aboutdialog.glade
@@ -10,7 +10,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Paperwork</property>
-    <property name="version">1.2.2</property>
+    <property name="version">1.2.3</property>
     <property name="copyright" translatable="yes">
 </property>
     <property name="comments" translatable="yes">Grep for Dead Trees</property>
diff --git a/src/paperwork/frontend/mainwindow/__init__.py b/src/paperwork/frontend/mainwindow/__init__.py
index a022d3ff..8d51de82 100644
--- a/src/paperwork/frontend/mainwindow/__init__.py
+++ b/src/paperwork/frontend/mainwindow/__init__.py
@@ -90,7 +90,7 @@
 logger = logging.getLogger(__name__)
 
 
-__version__ = '1.2.2'
+__version__ = '1.2.3'
 
 
 # during tests, we have multiple instatiations of MainWindow(), but we must