New upstream release 2021_1.0.1-44

4 files changed, 36 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31791f46433c..dab6ba658b24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2020_1.0.7
-	pkgrel = 301
+	pkgver = 2021_1.0.1
+	pkgrel = 44
 	url = http://www.vs.ch/vstax
 	install = vstax.install
 	changelog = ChangeLog
@@ -10,10 +10,9 @@ pkgbase = vstax
 	depends = java-runtime
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = https://sftp.vs.ch/vstax/2020/vstax2020_1.0.7-301_amd64.deb
+	source = https://sftp.vs.ch/vstax/2021/vstax2021_1.0.1-44_amd64.deb
 	source = archlinux.patch
-	sha256sums = 8783a5c0dd8926eb50ea1c7603d110aaa223e0192d7a23014de8f32bda68fe83
-	sha256sums = de8a3f67f25217b10e8473c3b06097004b70e3572b2fdb8436c7f03637cf2840
+	sha256sums = d24e49fa05010810c086291680d2e6dc43e536227dcca18881a18826ff608fe9
+	sha256sums = 3a6d087acc6a995cd162f37ee7feb5c87f44ca0213ffd40215b1922b70416336
 
 pkgname = vstax
-
diff --git a/ChangeLog b/ChangeLog
index 81c3b64c4890..f7f185841068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-02-20 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2021_1.0.1-44:
+	New upstream release
+
 2021-03-22 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2020_1.0.7-301:
diff --git a/PKGBUILD b/PKGBUILD
index 35d2c820f06a..99a853252593 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Stéphane Donnet <donnet.stephane@gmail.com>
 
 pkgname="vstax"
-_year="2020"
-pkgver="${_year}_1.0.7"
-pkgrel="301"
+_year="2021"
+pkgver="${_year}_1.0.1"
+pkgrel="44"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
 license=('unknown')
@@ -17,8 +17,8 @@ install="vstax.install"
 changelog="ChangeLog"
 source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${pkgver}-${pkgrel}_amd64.deb"
         "archlinux.patch")
-sha256sums=('8783a5c0dd8926eb50ea1c7603d110aaa223e0192d7a23014de8f32bda68fe83'
-            'de8a3f67f25217b10e8473c3b06097004b70e3572b2fdb8436c7f03637cf2840')
+sha256sums=('d24e49fa05010810c086291680d2e6dc43e536227dcca18881a18826ff608fe9'
+            '3a6d087acc6a995cd162f37ee7feb5c87f44ca0213ffd40215b1922b70416336')
 
 
 prepare() {
diff --git a/archlinux.patch b/archlinux.patch
index 212531d3687e..4af44cfc6692 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,29 +1,29 @@
-Index: vstax/src/usr/share/vstax2020/vstax2020.sh
+Index: vstax/src/usr/share/applications/vstax2021.desktop
 ===================================================================
---- vstax.orig/src/usr/share/vstax2020/vstax2020.sh
-+++ vstax/src/usr/share/vstax2020/vstax2020.sh
-@@ -1,3 +1,3 @@
- #!/bin/sh
--cd /usr/share/vstax2020
--./jre/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR -jar jfw-launcher-7.2.8-obf.jar "$1"
-+cd /usr/share/java/vstax2020
-+/usr/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR -jar jfw-launcher-7.2.8-obf.jar "$1"
-Index: vstax/src/usr/share/applications/vstax2020.desktop
-===================================================================
---- vstax.orig/src/usr/share/applications/vstax2020.desktop
-+++ vstax/src/usr/share/applications/vstax2020.desktop
+--- vstax.orig/src/usr/share/applications/vstax2021.desktop
++++ vstax/src/usr/share/applications/vstax2021.desktop
 @@ -1,12 +1,12 @@
  [Desktop Entry]
  Version=1.0
  Terminal=false
--Icon=/usr/share/vstax2020/vstax2020.png
-+Icon=/usr/share/java/vstax2020/vstax2020.png
+-Icon=/usr/share/vstax2021/vstax2021.png
++Icon=/usr/share/java/vstax2021/vstax2021.png
  Type=Application
  StartupNotify=false
- StartupWMClass=vstax2020
+ StartupWMClass=vstax2021
  Categories=Office;
--Exec=/usr/share/vstax2020/vstax2020.sh %U
-+Exec=/usr/bin/vstax2020 %U
- MimeType=application/vstax2020;
- Name=VSTax 2020
- GenericName=VSTax 2020
+-Exec=/usr/share/vstax2021/vstax2021.sh %U
++Exec=/usr/bin/vstax2021 %U
+ MimeType=application/vstax2021;
+ Name=VSTax 2021
+ GenericName=VSTax 2021
+Index: vstax/src/usr/share/vstax2021/vstax2021.sh
+===================================================================
+--- vstax.orig/src/usr/share/vstax2021/vstax2021.sh
++++ vstax/src/usr/share/vstax2021/vstax2021.sh
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+-cd /usr/share/vstax2021
+-./jre/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.14-obf.jar "$1"
++cd /usr/share/java/vstax2021
++/usr/bin/java -Xmx400m -Xms400m -Djava.locale.providers=COMPAT,CLDR --add-exports=java.base/sun.net.www.protocol.file=ALL-UNNAMED --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED --add-exports=java.desktop/sun.awt.shell=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.jaxp.datatype=ALL-UNNAMED  -jar jfw-launcher-7.2.14-obf.jar "$1"