VaudTax 2021

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dca28972b8d1..65a60f0928b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = vaudtax
 	pkgdesc = VaudTax
-	pkgver = 2020
-	pkgrel = 3
+	pkgver = 2021
+	pkgrel = 1
 	url = https://www.vd.ch/themes/etat-droit-finances/impots/impots-pour-les-individus/remplir-ma-declaration-dimpot/vaudtax-2020/
 	arch = x86_64
 	license = custom
 	depends = webkitgtk2
-	depends = jre8-openjdk
+	depends = jre11-openjdk
 	depends = gnome-vfs
-	source = vaudtax-2020-1.1.4-production.tar.gz::https://vaudtax-dl.vd.ch/vaudtax2020/telechargement/linux/64bit/VaudTax_2020.tar.gz
+	source = vaudtax-2021-1.1-production.tar.gz::https://vaudtax-dl.vd.ch/vaudtax2021/telechargement/linux/64bit/VaudTax_2021.tar.gz
 	source = vaudtax
-	md5sums = 487cc7b647ca4e31536e62c865a77b2f
-	md5sums = 58628ce238328666d4b5c749ac528138
+	md5sums = 9dab90f060c483768f471a0fe3a48b3c
+	md5sums = 877950620de61664340112f413a685c9
 
 pkgname = vaudtax
-
diff --git a/PKGBUILD b/PKGBUILD
index 491789b514a0..a8f6fc47a6c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Bruno Renié <brutasse@gmail.com>
 pkgname=vaudtax
-pkgver=2020
-_pkgver=1.1.4-production
-pkgrel=3
+pkgver=2021
+_pkgver=1.1-production
+pkgrel=1
 pkgdesc="VaudTax"
 url="https://www.vd.ch/themes/etat-droit-finances/impots/impots-pour-les-individus/remplir-ma-declaration-dimpot/vaudtax-2020/"
-depends=('webkitgtk2' 'jre8-openjdk' 'gnome-vfs')
+depends=('webkitgtk2' 'jre11-openjdk' 'gnome-vfs')
 arch=(x86_64)
 license=('custom')
 source=("$pkgname-$pkgver-$_pkgver.tar.gz::https://vaudtax-dl.vd.ch/vaudtax$pkgver/telechargement/linux/64bit/VaudTax_$pkgver.tar.gz" 'vaudtax')
@@ -34,5 +34,5 @@ package() {
 	install -m755 ${srcdir}/${pkgname} "${pkgdir}"${_app_home}/bin/${pkgname}
 	ln -s ${_app_home}/bin/${pkgname} "${pkgdir}"/usr/bin/${pkgname}
 }
-md5sums=('487cc7b647ca4e31536e62c865a77b2f'
-         '58628ce238328666d4b5c749ac528138')
+md5sums=('9dab90f060c483768f471a0fe3a48b3c'
+         '877950620de61664340112f413a685c9')
diff --git a/vaudtax b/vaudtax
index cad7ae79de38..de7666aef4da 100644
--- a/vaudtax
+++ b/vaudtax
@@ -7,7 +7,7 @@ unset JDK_HOME
 
 prefix='/usr/share/vaudtax'
 
-export PATH="/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH"
+export PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
 
-classpath='lib/dvbern-lib-update.jar:lib/cryptutil.jar'
+classpath='lib/dvbern-lib-update.jar:lib/cryptutil.jar:lib/jaxb-api.jar:lib/activation.jar:lib/jaxb-impl.jar'
 cd $prefix && java -cp $classpath ch.dvbern.lib.update.Launcher