diff --git a/ChangeLog b/ChangeLog
index 1275ab3b..6eee954a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017/08/26 - 1.2.1:
+- Add source code of Windows installer (NSIS installer) generator
+- Scanner support / Multi-scan: Cancel also successful scan session. Otherwise
+ some scanner won't allow new scan sessions later.
+- Remove gi version warnings when starting (thanks to Matthieu Coudron)
+- Documentation: Add missing stdeb dependencies (thanks to Notkea)
+- paperwork-shell: Fix command 'scan'
+- paperwork-shell install: add docstring
+- Fix dialog 'about'
+
2017/07/11 - 1.2.0:
- Installation: A new command has been added: "paperwork-shell install".
This command installs icons and shortcut in the desktop menus.
diff --git a/setup.py b/setup.py
index 5863df6f..b98cf2ab 100755
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@
# * update the public key in
# src/paperwork/frontend/activation/__init__.py:check_activation_key()
# if required
- version="1.2.post3",
+ version="1.2.1",
description=(
"Using scanner and OCR to grep dead trees the easy way (Linux only)"
),
@@ -118,7 +118,7 @@
keywords="scanner ocr gui",
url="https://github.com/jflesch/paperwork",
download_url=("https://github.com/jflesch/paperwork"
- "/archive/1.2.tar.gz"),
+ "/archive/1.2.1.tar.gz"),
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: X11 Applications :: GTK",
@@ -156,7 +156,7 @@
"pypillowfight",
"pyxdg >= 0.25",
"termcolor", # used by paperwork-chkdeps
- "paperwork-backend>=1.2,<1.3",
+ "paperwork-backend>=1.2.1,<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 efc16adb..cec5d684 100644
--- a/src/paperwork/frontend/aboutdialog/aboutdialog.glade
+++ b/src/paperwork/frontend/aboutdialog/aboutdialog.glade
@@ -10,7 +10,7 @@
True
dialog
Paperwork
- 1.2
+ 1.2.1
Grep for Dead Trees
diff --git a/src/paperwork/frontend/mainwindow/__init__.py b/src/paperwork/frontend/mainwindow/__init__.py
index fc6c9511..4970ed69 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'
+__version__ = '1.2.1'
# during tests, we have multiple instatiations of MainWindow(), but we must