New upstream release

4 files changed, 38 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d706af248f88..7c0b3b54ed5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Oct 23 08:59:46 UTC 2018
+# Sat Feb 16 16:38:38 UTC 2019
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2017.1.0.17
+	pkgver = 2018.1.0.2
 	pkgrel = 1
 	url = http://www.vs.ch/vstax
 	install = vstax.install
@@ -13,10 +13,10 @@ pkgbase = vstax
 	depends = jdk8-openjdk
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2017/vstax2017_.deb
+	source = https://sftp.vs.ch/vstax/2018/vstax2018_.deb
 	source = archlinux.patch
-	sha256sums = cb5e0dbda0aa167e4d9a93819914a65581632557ebadb531e327db9aba7c6675
-	sha256sums = 1b11130669a9be63c68067b356b979ed57f9ee04fd523aa6c411d9333c90a7ee
+	sha256sums = aa43c003f758f932b15ef1c4ae657cffc8d73c3280126d0edb48ff7f48a12f31
+	sha256sums = fbbc58a513cf9ddb2bdb83c60ab4614fb143cd4ba0cabfe41066b3350766d76e
 
 pkgname = vstax
 
diff --git a/ChangeLog b/ChangeLog
index a4b08e280f26..4276d1f00184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-16 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2018.1.0.2-1:
+	New upstream release
+
 2018-10-23 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2017.1.0.17-1:
diff --git a/PKGBUILD b/PKGBUILD
index f2272e1f6c99..127339e07745 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer Fabien Dubosson <fabien.dubosson@gmail.com>
 
 pkgname="vstax"
-_year="2017"
-pkgver="${_year}.1.0.17"
+_year="2018"
+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,15 +15,15 @@ changelog="ChangeLog"
 [ "${CARCH}" = "x86_64" ] && _CARCH='amd64'
 source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb"
         'archlinux.patch')
-sha256sums=('cb5e0dbda0aa167e4d9a93819914a65581632557ebadb531e327db9aba7c6675'
-            '1b11130669a9be63c68067b356b979ed57f9ee04fd523aa6c411d9333c90a7ee')
-[ "${CARCH}" = "x86_64" ] && sha256sums[0]='4c2276e2a0aef5c184f6804c15d3d1336b429b115ab29888769908e75af41baf'
+sha256sums=('aa43c003f758f932b15ef1c4ae657cffc8d73c3280126d0edb48ff7f48a12f31'
+            'fbbc58a513cf9ddb2bdb83c60ab4614fb143cd4ba0cabfe41066b3350766d76e')
+[ "${CARCH}" = "x86_64" ] && sha256sums[0]='b239f2b8936e57fe18fa6ca251b00ff201a29323847c86aee17d7bd327d2de21'
 
 prepare() {
     cd "${srcdir}/"
 
     # Extract the data contained in the `deb` file
-    tar -xzf data.tar.gz
+    tar -xf data.tar.xz
 
     # Patch for archlinux
     patch -p2 < archlinux.patch
diff --git a/archlinux.patch b/archlinux.patch
index 3b209de56b1f..a5d4aefbdd6a 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,33 +1,33 @@
-Index: vstax/src/usr/share/vstax2017/vstax2017.sh
+Index: vstax/src/usr/share/vstax2018/vstax2018.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2017/vstax2017.sh
-+++ vstax/src/usr/share/vstax2017/vstax2017.sh
+--- vstax.orig/src/usr/share/vstax2018/vstax2018.sh
++++ vstax/src/usr/share/vstax2018/vstax2018.sh
 @@ -1,3 +1,4 @@
  #!/bin/sh
--cd /usr/share/vstax2017
--./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-5.0.31-obf.jar "$1"
-+cd /usr/share/java/vstax2017
+-cd /usr/share/vstax2018
+-./jre/bin/java -Xmx400m -Xms400m  -jar jfw-launcher-6.0.1-obf.jar "$1"
++cd /usr/share/java/vstax2018
 +export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
-+java -Xmx400m -Xms400m  -jar jfw-launcher-5.0.31-obf.jar "$1"
-Index: vstax/src/usr/share/applications/vstax2017.desktop
++java -Xmx400m -Xms400m  -jar jfw-launcher-6.0.1-obf.jar "$1"
+Index: vstax/src/usr/share/applications/vstax2018.desktop
 ===================================================================
---- vstax.orig/src/usr/share/applications/vstax2017.desktop
-+++ vstax/src/usr/share/applications/vstax2017.desktop
-@@ -1,11 +1,11 @@
+--- vstax.orig/src/usr/share/applications/vstax2018.desktop
++++ vstax/src/usr/share/applications/vstax2018.desktop
+@@ -1,15 +1,15 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2017/vstax2017.png
-+Icon=/usr/share/java/vstax2017/vstax2017.png
+-Icon=/usr/share/vstax2018/vstax2018.png
++Icon=/usr/share/java/vstax2018/vstax2018.png
  Type=Application
  StartupNotify=false
  Categories=Office;
--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
+-Exec=/usr/share/vstax2018/vstax2018.sh %U
++Exec=/usr/bin/vstax2018 %U
+ MimeType=application/vstax2018;
+ Name=VSTax 2018
+ GenericName=VSTax 2018
+ GenericName[en]=VSTax 2018
+ GenericName[de]=VSTax 2018
+ GenericName[fr]=VSTax 2018
+ GenericName[it]=VSTax 2018