New upstream release 2016-1.0.3

4 files changed, 37 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51292cff978d..afa78cf249f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul 15 09:43:53 UTC 2016
+# Sun Mar 12 09:25:20 UTC 2017
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2015.1.0.12
+	pkgver = 2016.1.0.3
 	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/2015/vstax2015_.deb
+	source = https://sftp.vs.ch/vstax/2016/vstax2016_.deb
 	source = archlinux.patch
-	sha256sums = 2f5e4a286e78355c52618c5a1d98a6cee99696d18d5668068a21ec51adcdc902
-	sha256sums = d45497f85f4c4f7b413ded1ff184df965a4154cd2e915d99c131ec236df2909d
+	sha256sums = 14ef61bd6aeaea8b18f054fa4b745f2b46ae8d833c93b8981fb04aec6c3b209c
+	sha256sums = 1617a9c1ca19a9b5a67a634f6bbc2fd487d63f465066820314519a01e2ad4b58
 
 pkgname = vstax
 
diff --git a/ChangeLog b/ChangeLog
index 95518b1b5392..5bed1cc6bbb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-12 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2016.1.0.3-1:
+	New upstream release
+
 2016-07-15 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2015.1.0.12-1:
diff --git a/PKGBUILD b/PKGBUILD
index 4bf7d77cc0d6..1fccab2dfd67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer Fabien Dubosson <fabien.dubosson@gmail.com>
 
 pkgname="vstax"
-_year="2015"
-pkgver="${_year}.1.0.12"
+_year="2016"
+pkgver="${_year}.1.0.3"
 pkgrel="1"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
@@ -12,12 +12,12 @@ depends=('java-runtime' 'shared-mime-info' 'desktop-file-utils')
 install="vstax.install"
 changelog="ChangeLog"
 [ "${CARCH}" = "i686" ] && _CARCH='i386'
-[ "${CARCH}" = "x86_64" ] && _CARCH='64'
+[ "${CARCH}" = "x86_64" ] && _CARCH='amd64'
 source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb"
         'archlinux.patch')
-sha256sums=('2f5e4a286e78355c52618c5a1d98a6cee99696d18d5668068a21ec51adcdc902'
-            'd45497f85f4c4f7b413ded1ff184df965a4154cd2e915d99c131ec236df2909d')
-[ "${_CARCH}" = "64" ] && sha256sums[0]='3a2f5d1c176c30e4de63c7036c6c96a024ab855c05b0ca6a717fa70a3375f794'
+sha256sums=('14ef61bd6aeaea8b18f054fa4b745f2b46ae8d833c93b8981fb04aec6c3b209c'
+            '1617a9c1ca19a9b5a67a634f6bbc2fd487d63f465066820314519a01e2ad4b58')
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='3cc48a9d750b159a21de6297af2684c39d1d1e5498d8a6edb9caa02678d9507e'
 
 prepare() {
     cd "${srcdir}/"
diff --git a/archlinux.patch b/archlinux.patch
index 3bb953ae6c61..6b8c95f4bc66 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,28 +1,32 @@
-Index: vstax/src/usr/share/vstax2015/vstax2015.sh
+Index: vstax/src/usr/share/vstax2016/vstax2016.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2015/vstax2015.sh
-+++ vstax/src/usr/share/vstax2015/vstax2015.sh
+--- vstax.orig/src/usr/share/vstax2016/vstax2016.sh
++++ vstax/src/usr/share/vstax2016/vstax2016.sh
 @@ -1,3 +1,3 @@
  #!/bin/sh
--cd /usr/share/vstax2015
--./jre/bin/java -Xmx320m -Xms320m  -jar jfw-launcher-5.0.13-obf.jar "$1"
-+cd /usr/share/java/vstax2015
-+"${JAVA_HOME}/bin/java" -Xmx320m -Xms320m  -jar jfw-launcher-5.0.13-obf.jar "$1"
-Index: vstax/src/usr/share/applications/vstax2015.desktop
+-cd /usr/share/vstax2016
+-./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-5.0.21-obf.jar "$1"
++cd /usr/share/java/vstax2016
++"${JAVA_HOME}/bin/java" -Xmx400m -Xms400m  -jar jfw-launcher-5.0.21-obf.jar "$1"
+Index: vstax/src/usr/share/applications/vstax2016.desktop
 ===================================================================
---- vstax.orig/src/usr/share/applications/vstax2015.desktop
-+++ vstax/src/usr/share/applications/vstax2015.desktop
+--- vstax.orig/src/usr/share/applications/vstax2016.desktop
++++ vstax/src/usr/share/applications/vstax2016.desktop
 @@ -1,11 +1,11 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2015/vstax2015.png
-+Icon=/usr/share/java/vstax2015/vstax2015.png
+-Icon=/usr/share/vstax2016/vstax2016.png
++Icon=/usr/share/java/vstax2016/vstax2016.png
  Type=Application
  StartupNotify=false
  Categories=Office;
--Exec=/usr/share/vstax2015/vstax2015.sh %U
-+Exec=/usr/bin/vstax2015 %U
- MimeType=application/vstax2015;
- Name=VSTax 2015
- GenericName=VSTax 2015
+-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