diff --git a/AUTHORS b/AUTHORS index d574a536..ba7d057a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,23 +4,26 @@ # Contributions to paperwork-backend must be counted here too Code contributors: + Alexandre Vaissière (3) Bignaux Ronan (1) Christophe Chauvet (1) - Dominique Hazael-Massieux + Dominique Hazael-Massieux (1) François Schmidts (7) - Glandos - Hannes <> - Jerome Flesch (2585) + Glandos (1) + Hannes <> (1) + Jerome Flesch (2834) Josselin Jacquard (35) - Krap <> - Matthias Mailänder <> (2) + Krap <> (1) Mathieu Jourdan (31) + Mathieu Schopfer (2) + Matthias Mailänder <> (2) + Matthieu Coudron (4) Patrick Scheid (2) - Paul Liétar (5) + Paul Liétar (6) pingtux <> (2) RyDroid (7) - Stefan Pokorny - Sébastien Maccagnoni-Munch (6) + Stefan Pokorny (1) + Sébastien Maccagnoni-Munch (2) Sebastian Spaeth (2) UI design: @@ -28,14 +31,15 @@ UI design: Translators: French: Jerome Flesch - German: Tristan Kohl (Mirodin) (13) + German: Tristan Kohl (Mirodin) (14) + Ukrainian: Daniel Korostil (1) Documentation contributors: Alain (1) arthurlutz (1) - Christophe Delaere + Christophe Delaere (2) Christophe GERARDIN (RTDaemons) (1) - Daniel Hahler (2) + Daniel Hahler (1) Davidbrcz (2) Jehan (1) lb1a (2) @@ -45,5 +49,6 @@ Documentation contributors: swap38 (1) Docker packaging: + foudfou (1) Markus Mayr (2) Thomas Clavier (2) diff --git a/ChangeLog b/ChangeLog index 3cc99275..83852539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2017/xx/xx - 1.2.0: +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. - Add integrated documentations: diff --git a/doc/install.archlinux.markdown b/doc/install.archlinux.markdown index 09f6ca9e..6298c6ea 100644 --- a/doc/install.archlinux.markdown +++ b/doc/install.archlinux.markdown @@ -18,40 +18,14 @@ guides for reference. ## Runtime dependencies -### Paperwork >= 1.2 +### Paperwork Once installed, please run ```paperwork-shell chkdeps paperwork_backend``` and ```paperwork-shell chkdeps paperwork``` to make sure all the required depencies are installed. You can run ```paperwork-shell install``` to add a Paperwork entry -in the menus of your desktop (Paperwork >= 1.2 only). - -### Paperwork >= 1.0 - -Once installed, please run ```paperwork-shell chkdeps paperwork_backend``` -and ```paperwork-shell chkdeps paperwork``` to make sure all the required -depencies are installed. - -### Paperwork >= 0.2.1 and < 1.0 - -Once installed, please run 'paperwork-chkdeps' to make sure all the required depencies are installed. - -### Paperwork <= 0.2.0 - -Some dependencies cannot be installed automatically, because they depend on your language: - -You need an OCR tool. You can use Tesseract or Cuneiform. For now, -[Tesseract is strongly recommended](https://github.com/jflesch/pyocr/issues/2): - - $ sudo pacman -S tesseract tesseract-data- - -Optional, but strongly recommended: -Spell checking is used to improve page orientation detection, so: - - $ sudo pacman -S aspell- - -The command "papework-chkdeps" can help you find any other missing dependency. +in the menus of your desktop. ## Running Paperwork diff --git a/doc/install.debian.markdown b/doc/install.debian.markdown index bd6a4e48..55cb9e1d 100644 --- a/doc/install.debian.markdown +++ b/doc/install.debian.markdown @@ -66,7 +66,7 @@ Finally, you have to run the following commands to check some extra dependencies $ paperwork-shell chkdeps paperwork_backend $ paperwork-shell chkdeps paperwork -And the menu entry (Paperwork >= 1.2 only): +And the menu entry: $ paperwork-shell install diff --git a/doc/install.devel.markdown b/doc/install.devel.markdown index f27fdfcc..e9c17e3a 100644 --- a/doc/install.devel.markdown +++ b/doc/install.devel.markdown @@ -27,7 +27,6 @@ $ sudo python3 ./setup.py install $ paperwork-shell chkdeps paperwork # if you want to add it in the menus -# (Paperwork >= 1.2 only) $ paperwork-shell install ``` diff --git a/src/paperwork/frontend/aboutdialog/aboutdialog.glade b/src/paperwork/frontend/aboutdialog/aboutdialog.glade index 2639e27d..efc16adb 100644 --- a/src/paperwork/frontend/aboutdialog/aboutdialog.glade +++ b/src/paperwork/frontend/aboutdialog/aboutdialog.glade @@ -10,7 +10,7 @@ True dialog Paperwork - 1.2-git + 1.2 Grep for Dead Trees diff --git a/src/paperwork/frontend/activation/__init__.py b/src/paperwork/frontend/activation/__init__.py index 0c3e613a..e13e1e4b 100644 --- a/src/paperwork/frontend/activation/__init__.py +++ b/src/paperwork/frontend/activation/__init__.py @@ -72,7 +72,7 @@ def check_activation_key(activation_key, email): # smart enough to build your own version of Paperwork for Windows. public_key = \ - b"gAN9cQAoWAEAAAB5cQFKHOxVIFgBAAAAZ3ECSuiU9CBYAQAAAHBxA4oFgwNinQB1Lg" + b"gAN9cQAoWAEAAAB5cQGKBU4Sv4UAWAEAAABwcQKKBdNTMv8AWAEAAABncQNKWhFrGXUu" public_key = unserialize_elgamal_key(public_key) activation_key = activation_key.encode("utf-8") email = b"" if email is None else email.encode("utf-8") diff --git a/src/paperwork/frontend/mainwindow/__init__.py b/src/paperwork/frontend/mainwindow/__init__.py index 990ca3bb..6230639d 100644 --- a/src/paperwork/frontend/mainwindow/__init__.py +++ b/src/paperwork/frontend/mainwindow/__init__.py @@ -86,7 +86,7 @@ logger = logging.getLogger(__name__) -__version__ = '1.2-git' +__version__ = '1.2' # during tests, we have multiple instatiations of MainWindow(), but we must