New upstream release

5 files changed, 54 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9dd5cc47cd7f..b548274453df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Feb 15 19:37:14 UTC 2016
 pkgbase = vstax
 	pkgdesc = Software to fill the tax forms of the canton of Valais, Switzerland
-	pkgver = 2014.1.0.10
+	pkgver = 2015.1.0.4
 	pkgrel = 1
 	url = http://www.vs.ch/vstax
 	install = vstax.install
@@ -11,10 +13,10 @@ pkgbase = vstax
 	depends = java-runtime
 	depends = shared-mime-info
 	depends = desktop-file-utils
-	source = http://www.vs.ch/home2/vstax/linux/vstax14/vstax2014_.deb
+	source = https://sftp.vs.ch/vstax/2015/vstax2015_.deb
 	source = archlinux.patch
-	sha1sums = edf0ef03faee50919ceda2900bcb6d3ae87c0091
-	sha1sums = 17237f0895c1e2d0d65a6e4a8d6755a256938441
+	sha256sums = 295d87df2c14f6851d11b04ff82956a6fc000745257bb083493d953de2c54b66
+	sha256sums = 9b5d88cd33be437ab16adf05f4c8b2c6524481e5f76927630d7239095b528088
 
 pkgname = vstax
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7a5374280e41
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+# Build
+src/
+pkg/
+
+# Sources/Packages
+*.deb
+*.tar
+
+# Quilt
+patches/
+.pc/
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index 3d2227e04c9d..a7a32d7bb7b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-15 Fabien Dubosson <fabien.dubosson@gmail.com>:
+
+	* 2015.1.0.4-1:
+	New upstream release
+
 2015-04-22 Fabien Dubosson <fabien.dubosson@gmail.com>:
 
 	* 2014.1.0.8-1:
diff --git a/PKGBUILD b/PKGBUILD
index 1e2ae9accb55..eb77ba3fd6b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer Dubosson <fabien.dubosson@gmail.com>
+# Maintainer Fabien Dubosson <fabien.dubosson@gmail.com>
 
 pkgname="vstax"
-_year="2014"
-pkgver="${_year}.1.0.10"
+_year="2015"
+pkgver="${_year}.1.0.4"
 pkgrel="1"
 pkgdesc="Software to fill the tax forms of the canton of Valais, Switzerland"
 url="http://www.vs.ch/vstax"
@@ -13,11 +13,11 @@ install="vstax.install"
 changelog="ChangeLog"
 [ "${CARCH}" = "i686" ] && _CARCH='i386'
 [ "${CARCH}" = "x86_64" ] && _CARCH='64'
-source=("http://www.vs.ch/home2/${pkgname}/linux/${pkgname}${_year:2:2}/${pkgname}${_year}_${_CARCH}.deb"
+source=("https://sftp.vs.ch/${pkgname}/${_year}/${pkgname}${_year}_${_CARCH}.deb"
         'archlinux.patch')
-sha1sums=('edf0ef03faee50919ceda2900bcb6d3ae87c0091'
-          '17237f0895c1e2d0d65a6e4a8d6755a256938441')
-[ "${_CARCH}" = "64" ] && sha1sums[0]='2e7c2e507add8b84ada8d018d5977eadbc637b9f'
+sha256sums=('295d87df2c14f6851d11b04ff82956a6fc000745257bb083493d953de2c54b66'
+            '9b5d88cd33be437ab16adf05f4c8b2c6524481e5f76927630d7239095b528088')
+[ "${_CARCH}" = "64" ] && sha256sums[0]='1c05801d761eb8e207de5577e7bc8c1ff987ca915119897e43d953386ac9f6d1'
 
 prepare() {
     cd "${srcdir}/"
diff --git a/archlinux.patch b/archlinux.patch
index 7e3c8fff610c..3db0637672f8 100644
--- a/archlinux.patch
+++ b/archlinux.patch
@@ -1,10 +1,28 @@
-Index: vstax/src/usr/share/vstax2014/vstax2014.sh
+Index: vstax/src/usr/share/vstax2015/vstax2015.sh
 ===================================================================
---- vstax.orig/src/usr/share/vstax2014/vstax2014.sh
-+++ vstax/src/usr/share/vstax2014/vstax2014.sh
+--- vstax.orig/src/usr/share/vstax2015/vstax2015.sh
++++ vstax/src/usr/share/vstax2015/vstax2015.sh
 @@ -1,3 +1,3 @@
  #!/bin/sh
--cd /usr/share/vstax2014
--./jre/bin/java -Xmx320m -Xms320m  -jar jfw-launcher-4.0.32-obf.jar "$1"
-+cd /usr/share/java/vstax2014
-+"${JAVA_HOME}/bin/java" -Xmx320m -Xms320m  -jar jfw-launcher-4.0.32-obf.jar "$1"
+-cd /usr/share/vstax2015
+-./jre/bin/java -Xmx320m -Xms320m  -jar jfw-launcher-5.0.12-obf.jar "$1"
++cd /usr/share/java/vstax2015
++"${JAVA_HOME}/bin/java" -Xmx320m -Xms320m  -jar jfw-launcher-5.0.12-obf.jar "$1"
+Index: vstax/src/usr/share/applications/vstax2015.desktop
+===================================================================
+--- vstax.orig/src/usr/share/applications/vstax2015.desktop
++++ vstax/src/usr/share/applications/vstax2015.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
+ 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