Updated to the latest nightly and cleanup the startup script. Also fixed a plugin manager issue

3 files changed, 7 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 68413b22267d..1cec12e904d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,13 +2,13 @@
 # Wed Apr  1 16:32:36 UTC 2015
 pkgbase = jitsi-nightly
 	pkgdesc = An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)
-	pkgver = 2.9.20160414
+	pkgver = 2.9.20160617
 	pkgrel = 1
 	url = http://jitsi.org
 	install = jitsi-nightly.install
 	arch = i686
 	arch = x86_64
-	license = LGPL
+	license = Apache
 	makedepends = apache-ant
 	depends = java-environment
 	depends = bash
@@ -30,7 +30,7 @@ pkgbase = jitsi-nightly
 	source = jitsi.sh
 	md5sums = SKIP
 	md5sums = f5c21e511756458172dc0ae8020c7bd5
-	md5sums = c73e041d22fd1df76b60002b148af988
+	md5sums = 800cb34c0d15f07c7e087ad0d83a39e3
 
 pkgname = jitsi-nightly
 
diff --git a/PKGBUILD b/PKGBUILD
index 27ecac17525d..eeacdaa5c1e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@ _pkgname=jitsi
 # pkgvermajor needs manual increment
 _pkgvermajor=2.9
 # pkgver is determined automatically
-pkgver=2.9.20160414
+pkgver=2.9.20160617
 pkgrel=1
 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
 arch=('i686' 'x86_64')
 url="https://jitsi.org"
-license=('LGPL')
+license=('Apache')
 provides=(jitsi)
 conflicts=(jitsi jitsi-stable)
 depends=('java-environment' 'bash' 'gtk2' 'libxv' 'alsa-lib' 'libxss')
@@ -29,7 +29,7 @@ source=(
 md5sums=(
   'SKIP'
   'f5c21e511756458172dc0ae8020c7bd5'
-   'c73e041d22fd1df76b60002b148af988'
+  '800cb34c0d15f07c7e087ad0d83a39e3'
 )
 install=jitsi-nightly.install
 
diff --git a/jitsi.sh b/jitsi.sh
index 0ed92de9419f..7c2d870fc11d 100644
--- a/jitsi.sh
+++ b/jitsi.sh
@@ -11,7 +11,7 @@ fi
 
 SCDIR=/usr/lib/jitsi
 LIBPATH=$SCDIR/lib
-CLASSPATH=$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/bcprovider.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar
+CLASSPATH=$LIBPATH/felix.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar:$SCDIR/sc-bundles/dnsjava.jar:$LIBPATH
 FELIX_CONFIG=$LIBPATH/felix.client.run.properties
 LOG_CONFIG=$LIBPATH/logging.properties
 COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=$LIBPATH/native -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG net.java.sip.communicator.launcher.SIPCommunicator"