Update to 1.6.0

3 files changed, 10 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f68100..a34b15a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
-# Generated by makepkg 4.2.1
-# Tue Apr 14 20:06:25 UTC 2015
+# Generated by mksrcinfo v8
+# Wed Jan 20 21:05:49 UTC 2016
 pkgbase = serviio
         pkgdesc = Free DLNA media server
-        pkgver = 1.5.2
-        pkgrel = 2
+        pkgver = 1.6
+        pkgrel = 0
         url = http://www.serviio.org/
         arch = any
         license = custom
         depends = java-runtime-headless=8
         depends = ffmpeg
-        source = http://download.serviio.org/releases/serviio-1.5.2-linux.tar.gz
+        source = http://download.serviio.org/releases/serviio-1.6-linux.tar.gz
         source = serviio.sh
-        source = serviio-console.sh
         source = serviio.service
         source = serviio.desktop
         source = serviio.png
         source = serviio.install
-        md5sums = 70cfa7d9f54b1c921194b6c0d6530ed6
+        md5sums = 2dae7c1a41b0de075d02c244fccd39ab
         md5sums = 227a75de2dea1db93c1fba3d004e01ad
-        md5sums = 7f38b2f294ce990958dcc63b583807b4
         md5sums = e958d9812448f97fe325dfffe8b44620
         md5sums = fbfcac4ad5dffd909e51ea1a7a6335aa
         md5sums = d41e3e757e412dfcd3036d9e19b81450
diff --git a/PKGBUILD b/PKGBUILD
index 57163d1..5f8f11c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=serviio
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.6
+pkgrel=0
 pkgdesc="Free DLNA media server"
 arch=('any')
 url="http://www.serviio.org/"
@@ -8,14 +8,12 @@ license=('custom')
 depends=('java-runtime-headless=8' 'ffmpeg')
 source=(http://download.serviio.org/releases/serviio-${pkgver}-linux.tar.gz
         $pkgname.sh
-        $pkgname-console.sh
         $pkgname.service
         $pkgname.desktop
         $pkgname.png
         $pkgname.install)
-md5sums=('70cfa7d9f54b1c921194b6c0d6530ed6'
+md5sums=('2dae7c1a41b0de075d02c244fccd39ab'
          '227a75de2dea1db93c1fba3d004e01ad'
-         '7f38b2f294ce990958dcc63b583807b4'
          'e958d9812448f97fe325dfffe8b44620'
          'fbfcac4ad5dffd909e51ea1a7a6335aa'
          'd41e3e757e412dfcd3036d9e19b81450'
@@ -32,7 +30,7 @@ package() {
 
   # place the serviio scripts in the /usr/bin folder
   install -Dm755 ${srcdir}/$pkgname.sh $pkgdir/usr/bin/$pkgname
-  install -Dm755 ${srcdir}/$pkgname-console.sh $pkgdir/usr/bin/$pkgname-console
+  install -Dm755 bin/$pkgname-console.sh $pkgdir/usr/bin/$pkgname-console
 
   # copy xml config files to the config folder
   install -m644 config/*.xml ${SERVIIO_HOME}/config
diff --git a/serviio-console.sh b/serviio-console.sh
deleted file mode 100644
index 976d59b..0000000
--- a/serviio-console.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-    export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
-    SERVIIO_CONSOLE_HOME="/usr/share/java/serviio"
-    SERVIIO_CLASS_PATH="$SERVIIO_CONSOLE_HOME/lib/*:$SERVIIO_CONSOLE_HOME/config"
-    JAVA_OPTS="-Dserviio.home=$SERVIIO_CONSOLE_HOME -Djava.net.preferIPv4Stack=true"
-
-    java -Xmx512M $JAVA_OPTS -classpath $SERVIIO_CLASS_PATH org.serviio.console.ServiioConsole "$@"