New upstream version 2017.1.0.2

4 files changed, 36 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02661797f30f..d52f14f36382 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Apr 21 13:17:53 UTC 2017
+# Sun Feb 11 10:35:18 UTC 2018
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2016.1.0.9
+	pkgver = 2017.1.0.2
 	pkgrel = 1
 	url = http://www.vs.ch/vstax
 	install = vstax.install
@@ -13,10 +13,10 @@ pkgbase = vstax
 	depends = java-runtime
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2016/vstax2016_.deb
+	source = https://sftp.vs.ch/vstax/2017/vstax2017_.deb
 	source = archlinux.patch
-	sha256sums = ce79d516b1db8cdab4bbc7de6387c547df0ad91f86b4430419a8bed109034ffb
-	sha256sums = bf45367c2903b587625fd685e8a528dbb4a61bde856b013c80e5aacd4dd592e0
+	sha256sums = 2285d7c11caf4219afb2ad32c0f86675fed439452ebbb5fa08ecc404a3eff565
+	sha256sums = 59e9c962252d32224293a3dfb81331ecd22ce4b39a6fd1c073e28557ab0eb69d
 
 pkgname = vstax
 
diff --git a/ChangeLog b/ChangeLog
index e5b71f7642da..dfac67067b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-11 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2017.1.0.2-1:
+	New upstream release
+
 2017-04-21 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2016.1.0.9-1:
diff --git a/PKGBUILD b/PKGBUILD
index 60e2e9fef05a..7544dbef74c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer Fabien Dubosson <fabien.dubosson@gmail.com>
 
 pkgname="vstax"
-_year="2016"
-pkgver="${_year}.1.0.9"
+_year="2017"
+pkgver="${_year}.1.0.2"
 pkgrel="1"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
@@ -15,9 +15,9 @@ changelog="ChangeLog"
 [ "${CARCH}" = "x86_64" ] && _CARCH='amd64'
 source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb"
         'archlinux.patch')
-sha256sums=('ce79d516b1db8cdab4bbc7de6387c547df0ad91f86b4430419a8bed109034ffb'
-            'bf45367c2903b587625fd685e8a528dbb4a61bde856b013c80e5aacd4dd592e0')
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='b56b3e06ea62cd6bca6f6480fef063263059423289b2cd30041ac120aa5a9bb9'
+sha256sums=('2285d7c11caf4219afb2ad32c0f86675fed439452ebbb5fa08ecc404a3eff565'
+            '59e9c962252d32224293a3dfb81331ecd22ce4b39a6fd1c073e28557ab0eb69d')
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='faab1dac1d68a7fea78a1e8c45440ce531bc91d6f7f8c614e48b64ca736afa28'
 
 prepare() {
     cd "${srcdir}/"
diff --git a/archlinux.patch b/archlinux.patch
index 660b0f6a4583..eaf36408cd30 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,32 +1,32 @@
-Index: vstax/src/usr/share/vstax2016/vstax2016.sh
+Index: vstax/src/usr/share/vstax2017/vstax2017.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2016/vstax2016.sh
-+++ vstax/src/usr/share/vstax2016/vstax2016.sh
+--- vstax.orig/src/usr/share/vstax2017/vstax2017.sh
++++ vstax/src/usr/share/vstax2017/vstax2017.sh
 @@ -1,3 +1,3 @@
  #!/bin/sh
--cd /usr/share/vstax2016
--./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-5.0.22-obf.jar "$1"
-+cd /usr/share/java/vstax2016
-+"${JAVA_HOME}/bin/java" -Xmx400m -Xms400m  -jar jfw-launcher-5.0.22-obf.jar "$1"
-Index: vstax/src/usr/share/applications/vstax2016.desktop
+-cd /usr/share/vstax2017
+-./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-5.0.26-obf.jar "$1"
++cd /usr/share/java/vstax2017
++"${JAVA_HOME}/bin/java" -Xmx400m -Xms400m  -jar jfw-launcher-5.0.26-obf.jar "$1"
+Index: vstax/src/usr/share/applications/vstax2017.desktop
 ===================================================================
---- vstax.orig/src/usr/share/applications/vstax2016.desktop
-+++ vstax/src/usr/share/applications/vstax2016.desktop
+--- vstax.orig/src/usr/share/applications/vstax2017.desktop
++++ vstax/src/usr/share/applications/vstax2017.desktop
 @@ -1,11 +1,11 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2016/vstax2016.png
-+Icon=/usr/share/java/vstax2016/vstax2016.png
+-Icon=/usr/share/vstax2017/vstax2017.png
++Icon=/usr/share/java/vstax2017/vstax2017.png
  Type=Application
  StartupNotify=false
  Categories=Office;
--Exec=/usr/share/vstax2016/vstax2016.sh %U
-+Exec=/usr/bin/vstax2016 %U
- MimeType=application/vstax2016;
- Name=VSTax 2016
- GenericName=VSTax 2016
- GenericName[en]=VSTax 2016
- GenericName[de]=VSTax 2016
- GenericName[fr]=VSTax 2016
- GenericName[it]=VSTax 2016
+-Exec=/usr/share/vstax2017/vstax2017.sh %U
++Exec=/usr/bin/vstax2017 %U
+ MimeType=application/vstax2017;
+ Name=VSTax 2017
+ GenericName=VSTax 2017
+ GenericName[en]=VSTax 2017
+ GenericName[de]=VSTax 2017
+ GenericName[fr]=VSTax 2017
+ GenericName[it]=VSTax 2017