From 6ff07dcc9bebe9910249777bcfb0ca8584f0b84e Mon Sep 17 00:00:00 2001 From: Jerome Flesch Date: Tue, 22 Nov 2016 12:55:06 +0100 Subject: [PATCH] 1.0.5 Signed-off-by: Jerome Flesch --- ChangeLog | 6 ++++ README.markdown | 28 ------------------- setup.py | 5 ++-- .../frontend/aboutdialog/aboutdialog.glade | 2 +- src/paperwork/frontend/mainwindow/__init__.py | 2 +- 5 files changed, 10 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c80be5a..aea2ff7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016/11/22 - 1.0.5: +- Setting the resolution on the scanner may not actually work. If it is not + possible to set the resolution, fall back on the current one. +- Improve tolerance to crappy scanner drivers: don't stop + if pyinsane2.maximize_scan_area() fails + 2016/11/18 - 1.0.4: - Windows: Fix import error dialog - Windows: Fix GtkLinkButtons (didn't do anything when clicked) diff --git a/README.markdown b/README.markdown index bfa30a6d..2e852ce6 100644 --- a/README.markdown +++ b/README.markdown @@ -128,34 +128,6 @@ they are stored in a separate Git repository: GPLv3 or later. See COPYING. -## Archives - -Github can automatically provide .tar.gz and .zip files if required. However, -they are not required to install Paperwork. They are indicated here as a -convenience for package maintainers. - -* [Paperwork 1.0.4](https://github.com/jflesch/paperwork/archive/1.0.4.tar.gz) -* [Paperwork 1.0.3](https://github.com/jflesch/paperwork/archive/1.0.3.tar.gz) -* [Paperwork 1.0.2](https://github.com/jflesch/paperwork/archive/1.0.2.tar.gz) -* [Paperwork 1.0.1](https://github.com/jflesch/paperwork/archive/1.0.1.tar.gz) -* [Paperwork 1.0](https://github.com/jflesch/paperwork/archive/1.0.tar.gz) -* [Paperwork 0.3.2](https://github.com/jflesch/paperwork/archive/0.3.2.tar.gz) -* [Paperwork 0.3.1.1](https://github.com/jflesch/paperwork/archive/0.3.1.1.tar.gz) -* [Paperwork 0.3.1](https://github.com/jflesch/paperwork/archive/0.3.1.tar.gz) -* [Paperwork 0.3.0.1](https://github.com/jflesch/paperwork/archive/0.3.0.1.tar.gz) -* [Paperwork 0.3.0](https://github.com/jflesch/paperwork/archive/0.3.0.tar.gz) -* [Paperwork 0.2.5](https://github.com/jflesch/paperwork/archive/0.2.5.tar.gz) -* [Paperwork 0.2.4](https://github.com/jflesch/paperwork/archive/0.2.4.tar.gz) -* [Paperwork 0.2.3](https://github.com/jflesch/paperwork/archive/0.2.3.tar.gz) -* [Paperwork 0.2.2](https://github.com/jflesch/paperwork/archive/0.2.2.tar.gz) -* [Paperwork 0.2.1](https://github.com/jflesch/paperwork/archive/0.2.1.tar.gz) -* [Paperwork 0.2](https://github.com/jflesch/paperwork/archive/0.2.tar.gz) -* [Paperwork 0.1.3](https://github.com/jflesch/paperwork/archive/0.1.3.tar.gz) -* [Paperwork 0.1.2](https://github.com/jflesch/paperwork/archive/0.1.2.tar.gz) -* [Paperwork 0.1.1](https://github.com/jflesch/paperwork/archive/0.1.1.tar.gz) -* [Paperwork 0.1](https://github.com/jflesch/paperwork/archive/0.1.tar.gz) - - ## Development All the information can be found on [the wiki](https://github.com/jflesch/paperwork/wiki#for-developers) diff --git a/setup.py b/setup.py index c15e8412..f83a680d 100755 --- a/setup.py +++ b/setup.py @@ -20,12 +20,11 @@ # src/paperwork/frontend/aboutdialog/aboutdialog.glade # * change it also in # src/paperwork/frontend/mainwindow/__init__.py:__version__ - # * update the archive list in the README # * update the dependency version on paperwork-backend # * update the public key in # src/paperwork/frontend/activation/__init__.py:check_activation_key() # if required - version="1.0.4", + version="1.0.5", description=( "Using scanner and OCR to grep dead trees the easy way (Linux only)" ), @@ -238,7 +237,7 @@ "pyocr >= 0.3.0", "pypillowfight", "termcolor", # used by paperwork-chkdeps - "paperwork-backend >= 1.0.4", + "paperwork-backend >= 1.0.5", # 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 e8700503..d4327c82 100644 --- a/src/paperwork/frontend/aboutdialog/aboutdialog.glade +++ b/src/paperwork/frontend/aboutdialog/aboutdialog.glade @@ -10,7 +10,7 @@ True dialog Paperwork - 1.0.4 + 1.0.5 Grep for Dead Trees diff --git a/src/paperwork/frontend/mainwindow/__init__.py b/src/paperwork/frontend/mainwindow/__init__.py index 4bb4c9d6..8c058505 100644 --- a/src/paperwork/frontend/mainwindow/__init__.py +++ b/src/paperwork/frontend/mainwindow/__init__.py @@ -79,7 +79,7 @@ logger = logging.getLogger(__name__) -__version__ = '1.0.4' +__version__ = '1.0.5' # during tests, we have multiple instatiations of MainWindow(), but we must