Update to version 2.6

The version of python-django-rest-framework is lower than requested
by upstream. However, the rest framework package is not up to date
and on my installation everyting works also with the currently
available version. This, lets give it a shot.

3 files changed, 71 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05fa89c7309d..d4930942f77f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,44 @@
 pkgbase = paperless
 	pkgdesc = Scan, index, and archive all of your paper documents
-	pkgver = 2.2.1
+	pkgver = 2.6.0
 	pkgrel = 1
 	url = https://github.com/danielquinn/paperless
 	install = paperless.install
 	arch = any
 	license = GPL3
-	depends = python-django>=2.0
-	depends = python-django-extensions>=2.1.2
+	depends = python-django>=2.0.9
+	depends = python-django-extensions>=2.1.3
 	depends = python-django-rest-framework>=3.7.7
 	depends = python-django-crispy-forms>=1.7.2
 	depends = python-django-filter>=2.0.0
 	depends = python-fuzzywuzzy>=0.16.0
-	depends = python-pyocr>=0.5.2
+	depends = python-pyocr>=0.5.3
 	depends = python-gnupg>=0.4.3
-	depends = python-pillow>=5.2
-	depends = python-dotenv>=0.7.1
-	depends = python-dateutil>=0.6.6
+	depends = python-pillow>=5.3
+	depends = python-dotenv>=0.9.1
+	depends = python-dateutil>=2.7.5
 	depends = python-magic
 	depends = python-langdetect>=1.0.7
 	depends = tesseract
 	depends = unpaper
 	depends = ghostscript
 	depends = python-dateparser>=0.7.0
-	depends = python-pdftotext>=2.1.0
+	depends = python-pdftotext>=2.1.1
 	depends = python-more-itertools>=4.3.0
 	depends = python-levenshtein>=0.12
-	depends = python-pytz>=2018.5
-	depends = python-regex>=2018.08.29
+	depends = python-pytz>=2018.7
+	depends = python-regex>=2018.11.2
 	depends = python-django-cors-headers>=2.4.0
 	depends = python-termcolor>=1.1.0
+	depends = optipng
 	options = !buildflags
 	backup = etc/paperless.conf
-	source = paperless-2.2.1.tar.gz::https://github.com/danielquinn/paperless/archive/2.2.1.tar.gz
+	source = paperless-2.6.0.tar.gz::https://github.com/danielquinn/paperless/archive/2.6.0.tar.gz
 	source = paperless.conf
 	source = paperless-consumer.service
 	source = paperless-webserver.service
-	sha512sums = 8871a245a31020dddf56d586364eeb51158cfec9fab6a5d8c692ed29cc84a2916c2395358b5b7eb3289e3698c798b2e0a3058ec721cec654a3578c867d7c0aeb
-	sha512sums = d5e2d34983d98b4e7435999cf1e5a758f9eeea9dc2c5352aa59c796059818fa48d7a3d3d431800ad5828554c258d9454d289cb17cce5edc658f5db4d6b4e3990
+	sha512sums = 733cb67a7af6d09eec18fb3246b35c6010cb84fc0571b25c3f4236386a604d97ec5b8278f9929e1b28bdd64dd38a696c27462eb0bbe36121662cd47b417d9d19
+	sha512sums = 3b57ccd9515b23847dc366fb8183ec4c1fd1c27a5186d5ed5f0a4c7d5d1be1e2adac625d7525b1a710727fcd2b8e8693305997ce6b8b6b683fa4dfa0fdc1a20a
 	sha512sums = de3a825b24e310d6d97446cb7d206718eba10d6ab4c63c140a0325fe5e641d422bfdf0e39dc10406c37157ff6d2a45764a4d9c4f1559555e0023aef467d6f137
 	sha512sums = c148bffd5b7cde4730043955921f9220251abf330c54f20169863edd2acf5d5a59b2c59cdf50fb3e4a09587e813a54ef334c0c96ea55c3b8e419ea032c42ccf3
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e82dc8d8e8d..8ae3ff5bae9d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
 # Maintainer: Wolfgang Mader <Wolfgang at Mad3r dot de>
 
 pkgname=paperless
-pkgver=2.2.1
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="Scan, index, and archive all of your paper documents"
 arch=('any')
 url="https://github.com/danielquinn/paperless"
 license=('GPL3')
 options=(!buildflags)
-depends=('python-django>=2.0' 'python-django-extensions>=2.1.2' 'python-django-rest-framework>=3.7.7' 'python-django-crispy-forms>=1.7.2' 'python-django-filter>=2.0.0' 'python-fuzzywuzzy>=0.16.0' 'python-pyocr>=0.5.2' 'python-gnupg>=0.4.3' 'python-pillow>=5.2' 'python-dotenv>=0.7.1' 'python-dateutil>=0.6.6' 'python-magic' 'python-langdetect>=1.0.7' 'tesseract' 'unpaper' 'ghostscript' 'python-dateparser>=0.7.0' 'python-pdftotext>=2.1.0' 'python-more-itertools>=4.3.0' 'python-levenshtein>=0.12' 'python-pytz>=2018.5' 'python-regex>=2018.08.29' 'python-django-cors-headers>=2.4.0' 'python-termcolor>=1.1.0')
+depends=('python-django>=2.0.9' 'python-django-extensions>=2.1.3' 'python-django-rest-framework>=3.7.7' 'python-django-crispy-forms>=1.7.2' 'python-django-filter>=2.0.0' 'python-fuzzywuzzy>=0.16.0' 'python-pyocr>=0.5.3' 'python-gnupg>=0.4.3' 'python-pillow>=5.3' 'python-dotenv>=0.9.1' 'python-dateutil>=2.7.5' 'python-magic' 'python-langdetect>=1.0.7' 'tesseract' 'unpaper' 'ghostscript' 'python-dateparser>=0.7.0' 'python-pdftotext>=2.1.1' 'python-more-itertools>=4.3.0' 'python-levenshtein>=0.12' 'python-pytz>=2018.7' 'python-regex>=2018.11.2' 'python-django-cors-headers>=2.4.0' 'python-termcolor>=1.1.0' 'optipng')
 source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
         paperless.conf
         paperless-consumer.service
         paperless-webserver.service)
-sha512sums=('8871a245a31020dddf56d586364eeb51158cfec9fab6a5d8c692ed29cc84a2916c2395358b5b7eb3289e3698c798b2e0a3058ec721cec654a3578c867d7c0aeb'
-            'd5e2d34983d98b4e7435999cf1e5a758f9eeea9dc2c5352aa59c796059818fa48d7a3d3d431800ad5828554c258d9454d289cb17cce5edc658f5db4d6b4e3990'
+sha512sums=('733cb67a7af6d09eec18fb3246b35c6010cb84fc0571b25c3f4236386a604d97ec5b8278f9929e1b28bdd64dd38a696c27462eb0bbe36121662cd47b417d9d19'
+            '3b57ccd9515b23847dc366fb8183ec4c1fd1c27a5186d5ed5f0a4c7d5d1be1e2adac625d7525b1a710727fcd2b8e8693305997ce6b8b6b683fa4dfa0fdc1a20a'
             'de3a825b24e310d6d97446cb7d206718eba10d6ab4c63c140a0325fe5e641d422bfdf0e39dc10406c37157ff6d2a45764a4d9c4f1559555e0023aef467d6f137'
             'c148bffd5b7cde4730043955921f9220251abf330c54f20169863edd2acf5d5a59b2c59cdf50fb3e4a09587e813a54ef334c0c96ea55c3b8e419ea032c42ccf3')
 backup=("etc/paperless.conf")
diff --git a/paperless.conf b/paperless.conf
index ff2426761e98..58d3f09d9061 100644
--- a/paperless.conf
+++ b/paperless.conf
@@ -1,10 +1,8 @@
-# paperless.conf
-# Set at least the values for
-#   PAPERLESS_CONSUMPTION_DIR
-#   PAPERLESS_OCR_LANGUAGE
-# If you want to run the default django-webserver comming with paperless on a
-# public network, also set
-#   PAPERLESS_ALLOWED_HOSTS
+# Sample paperless.conf
+# Copy this file to /etc/paperless.conf and modify it to suit your needs.
+# As this file contains passwords it should only be readable by the user
+# running paperless.
+
 
 ###############################################################################
 ####                         Paths & Folders                               ####
@@ -61,6 +59,11 @@ PAPERLESS_EMAIL_SECRET=""
 ####                              Security                                 ####
 ###############################################################################
 
+# Controls whether django's debug mode is enabled. Disable this on production
+# systems. Debug mode is enabled by default.
+PAPERLESS_DEBUG="false"
+
+
 # Paperless can be instructed to attempt to encrypt your PDF files with GPG
 # using the PAPERLESS_PASSPHRASE specified below.  If however you're not
 # concerned about encrypting these files (for example if you have disk
@@ -119,6 +122,18 @@ PAPERLESS_EMAIL_SECRET=""
 # http://paperless.readthedocs.org/en/latest/consumption.html#hooking-into-the-consumption-process
 #PAPERLESS_POST_CONSUME_SCRIPT="/path/to/an/arbitrary/script.sh"
 
+# By default, when clicking on a document within the web interface, the
+# browser will prompt the user to save the document to disk. By setting this to
+# "true", the document will instead be opened in the browser, if possible.
+#PAPERLESS_INLINE_DOC="false"
+
+# By default, paperless will check the document text for document date information.
+# Uncomment the line below to enable checking the document filename for date
+# information. The date order can be set to any option as specified in
+# https://dateparser.readthedocs.io/en/latest/#settings. The filename will be
+# checked first, and if nothing is found, the document text will be checked
+# as normal.
+#PAPERLESS_FILENAME_DATE_ORDER="YMD"
 
 #
 # The following values use sensible defaults for modern systems, but if you're
@@ -181,6 +196,12 @@ PAPERLESS_EMAIL_SECRET=""
 #PAPERLESS_CONSUMER_LOOP_TIME=10
 
 
+# By default Paperless stops consuming a document if no language can be
+# detected. Set to true to consume documents even if the language detection
+# fails.
+#PAPERLESS_FORGIVING_OCR="false"
+
+
 ###############################################################################
 ####                            Interface                                  ####
 ###############################################################################
@@ -201,3 +222,28 @@ PAPERLESS_EMAIL_SECRET=""
 # positive integer, but if you don't define one in paperless.conf, a default of
 # 100 will be used.
 #PAPERLESS_LIST_PER_PAGE=100
+
+
+# The number of years for which a correspondent will be included in the recent
+# correspondents filter.
+#PAPERLESS_RECENT_CORRESPONDENT_YEARS=1
+
+###############################################################################
+####                     Third-Party Binaries                              ####
+###############################################################################
+
+# There are a few external software packages that Paperless expects to find on
+# your system when it starts up.  Unless you've done something creative with
+# their installation, you probably won't need to edit any of these.  However,
+# if you've installed these programs somewhere where simply typing the name of
+# the program doesn't automatically execute it (ie. the program isn't in your
+# $PATH), then you'll need to specify the literal path for that program here.
+
+# Convert (part of the ImageMagick suite)
+#PAPERLESS_CONVERT_BINARY=/usr/bin/convert
+
+# Unpaper
+#PAPERLESS_UNPAPER_BINARY=/usr/bin/unpaper
+
+# Optipng (for optimising thumbnail sizes)
+#PAPERLESS_OPTIPNG_BINARY=/usr/bin/optipng