Merge branch 'master' of ssh://aur.archlinux.org/brscan-skey into master

Revert to 2.4_1

2 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bcde38c6080..3325c90375d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,8 @@
-# Generated by mksrcinfo v8
-# Wed May 11 11:45:52 UTC 2016
 pkgbase = brscan-skey
 	pkgdesc = Brother scan-key-tool
-	pkgver = 0.2.4_1
-	pkgrel = 12
-	url = http://support.brother.com/g/s/id/linux/en
+	pkgver = 0.3.1_1
+	pkgrel = 1
+	url = https://support.brother.com
 	install = brscan-skey.install
 	arch = i686
 	arch = x86_64
@@ -15,14 +13,12 @@ pkgbase = brscan-skey
 	optdepends = cuneiform: for default "Scan to OCR" script
 	source = brscan-skey.service
 	source = brscan-skey-user.service
-	source = LICENSE.html
 	sha256sums = 80d1d92f71381c160a93ddac1bfcde1e7922dc84332f1f7561c6d328af7e7219
 	sha256sums = 511e49ac6618f2c11e5ed3a4ce4c235bd5d46faa584974f318447b117759651a
-	sha256sums = 7529071ca3e1a5a1a8558a4d2fc5dd47a4f104f1eb3e9be093de8a2a7c3a216a
-	source_i686 = http://download.brother.com/welcome/dlf006649/brscan-skey-0.2.4-1.i386.rpm
-	sha256sums_i686 = 30e236f1256d88431eb6fd8f052165ed976b0616e89cdb18196bf894d06c401a
-	source_x86_64 = http://download.brother.com/welcome/dlf006650/brscan-skey-0.2.4-1.x86_64.rpm
-	sha256sums_x86_64 = 2e034b37e282e44a6f94315d932eb8f34693007e4abd10ca10fb4ec468c9bb3d
+	source_i686 = https://download.brother.com/welcome/dlf006649/brscan-skey-0.3.1-1.i386.rpm
+	sha256sums_i686 = 6421b1eb56b2f2f0ca9602a877898889ed582a527f5efac094025255ad48e79d
+	source_x86_64 = https://download.brother.com/welcome/dlf006650/brscan-skey-0.3.1-1.x86_64.rpm
+	sha256sums_x86_64 = 0fe2c708eddc51ba6299eaf9a37f1c309d3e398411c61886b291aa402706aa10
 
 pkgname = brscan-skey
 
diff --git a/PKGBUILD b/PKGBUILD
index b49077ea1e6d..69ed819b2367 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Rob Cornish <jrmcornish AT gmail DOT com>
+# Maintainer: Jack Rubacha <rubacha.jack03@gmail.com>
+# Contributor: Rob Cornish <jrmcornish AT gmail DOT com>
 pkgname=brscan-skey
-pkgver=0.2.4_1
-pkgrel=12
+pkgver=0.3.1_1
+pkgrel=1
 pkgdesc='Brother scan-key-tool'
 arch=('i686' 'x86_64')
-url='http://support.brother.com/g/s/id/linux/en'
+url='https://support.brother.com'
 license=('custom:Brother')
 optdepends=('sane: for all default scanning scripts'
             'sendmail: for default "Scan to email" script'
@@ -12,16 +13,15 @@ optdepends=('sane: for all default scanning scripts'
             'cuneiform: for default "Scan to OCR" script')
 install=brscan-skey.install
 
-source_i686=("http://download.brother.com/welcome/dlf006649/$pkgname-${pkgver/_/-}.i386.rpm")
-sha256sums_i686=('30e236f1256d88431eb6fd8f052165ed976b0616e89cdb18196bf894d06c401a')
+source_i686=("https://download.brother.com/welcome/dlf006649/brscan-skey-0.3.1-1.i386.rpm")
+sha256sums_i686=('6421b1eb56b2f2f0ca9602a877898889ed582a527f5efac094025255ad48e79d')
 
-source_x86_64=("http://download.brother.com/welcome/dlf006650/$pkgname-${pkgver/_/-}.x86_64.rpm")
-sha256sums_x86_64=('2e034b37e282e44a6f94315d932eb8f34693007e4abd10ca10fb4ec468c9bb3d')
+source_x86_64=("https://download.brother.com/welcome/dlf006650/brscan-skey-0.3.1-1.x86_64.rpm")
+sha256sums_x86_64=('0fe2c708eddc51ba6299eaf9a37f1c309d3e398411c61886b291aa402706aa10')
 
-source=('brscan-skey.service' 'brscan-skey-user.service' 'LICENSE.html')
+source=('brscan-skey.service' 'brscan-skey-user.service')
 sha256sums=('80d1d92f71381c160a93ddac1bfcde1e7922dc84332f1f7561c6d328af7e7219'
-            '511e49ac6618f2c11e5ed3a4ce4c235bd5d46faa584974f318447b117759651a'
-            '7529071ca3e1a5a1a8558a4d2fc5dd47a4f104f1eb3e9be093de8a2a7c3a216a')
+            '511e49ac6618f2c11e5ed3a4ce4c235bd5d46faa584974f318447b117759651a')
 
 package() {
     cp -r "$srcdir"/opt "$pkgdir"
@@ -33,7 +33,7 @@ package() {
     install -D -m644 "$srcdir"/brscan-skey-user.service "$pkgdir"/usr/lib/systemd/user/brscan-skey.service
 
     install -d -m755 "$pkgdir"/usr/share/licenses/$pkgname
-    install -D -m644 "$srcdir"/LICENSE.html "$pkgdir"/usr/share/licenses/$pkgname
+    install -D -m644 "$pkgdir"/opt/brother/scanner/brscan-skey/LICENSE_ENG.txt "$pkgdir"/usr/share/licenses/$pkgname
 
     install -d "$pkgdir"/srv
     install -d -m 775 -o 289 -g 289 "$pkgdir"/srv/brscan-skey