jitsi-2.0.4506.10553-6: updating version

5 files changed, 65 insertions, 67 deletions

diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
new file mode 100644
index 000000000..788d4f435
--- /dev/null
+++ b/pcr/jitsi/PKGBUILD
@@ -0,0 +1,48 @@
+# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
+# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
+
+pkgname=jitsi
+pkgver=2.0.4506.10553
+pkgrel=6
+pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
+arch=('i686' 'x86_64')
+url="http://jitsi.org"
+license=('LGPL')
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+options=(!strip !emptydirs zipman !libtool docs)
+source=("http://download.jitsi.org/jitsi/src/jitsi-src-${pkgver}.zip"
+		jitsi.desktop
+		jitsi.sh)
+sha256sums=('939adbda52b5aa19592bcd5edf5c77e1bcbbcaa4d0fcdb59c6b5c9e4a10b1e7d'
+            '61e3bec3470790fa067f87d978016ec4452a6fd3dfba2c9afa5245b58d3cb19d'
+            '529722efc3bae6cb8923680363a4d778ccf78db9caf20bee90a110d34181d9f5')
+
+build()
+{
+  cd "${srcdir}/${pkgname}"
+  # append the build revision to the jitsi version
+  sed -i "s/0\.build\.by\.SVN/build.${pkgver}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
+  . /etc/profile.d/apache-ant.sh
+  ant rebuild
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  find lib/ lib/bundle/ -maxdepth 1 -type f \
+    -exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
+  find lib/os-specific/linux/ -maxdepth 1 -type f \
+    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
+  shopt -sq extglob
+  find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
+    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
+  find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
+    -execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
+  install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+  cd "resources/install/debian/"
+  for _file in *.{svg,xpm}; do
+    install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${_file}"
+  done
+}
diff --git a/~emulatorman/jitsi/jitsi.desktop b/pcr/jitsi/jitsi.desktop
index dd4de82a6..dd4de82a6 100644
--- a/~emulatorman/jitsi/jitsi.desktop
+++ b/pcr/jitsi/jitsi.desktop
diff --git a/pcr/jitsi/jitsi.sh b/pcr/jitsi/jitsi.sh
new file mode 100644
index 000000000..6e53cdbf5
--- /dev/null
+++ b/pcr/jitsi/jitsi.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+CLIENTARGS=""
+uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
+
+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"
+FELIX_CONFIG="$LIBPATH/felix.client.run.properties"
+LOG_CONFIG="$LIBPATH/logging.properties"
+COMMAND=("$JAVA_HOME/bin/java" $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)
+
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBPATH/native"
+
+cd "$SCDIR"
+
+exec "${COMMAND[@]}" "$@"
diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD
deleted file mode 100644
index 61460bd5c..000000000
--- a/~emulatorman/jitsi/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
-# Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban
-
-pkgname=jitsi
-pkgver=1.0.3967
-pkgrel=3
-pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)"
-arch=('i686' 'x86_64')
-url="http://jitsi.org"
-license=('LGPL')
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
-options=(!strip !emptydirs zipman !libtool docs)
-source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.zip"
-	jitsi.desktop
-	jitsi.sh)
-md5sums=('0fb7aaaad551177c3037ae570ca2f2e1'
-	'aad7cf1fb18ff5d7c964834ecc38aed8'
-	'b36c119d2005507e38cd5cb68f4ba31a')
-
-build()
-{
-	cd ${srcdir}/${pkgname}
-	# append the build revision to the jitsi version
-	sed -i "s/0\.build\.by\.SVN/build.${pkgver##*.}/" src/net/java/sip/communicator/impl/version/NightlyBuildID.java
-	. /etc/profile.d/apache-ant.sh
-	ant rebuild
-}
-
-package() {
-	cd ${srcdir}/${pkgname}
-	find lib/ lib/bundle/ -maxdepth 1 -type f \
-		-exec install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/"{} \;
-	find lib/os-specific/linux/ -maxdepth 1 -type f \
-		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/"{} \;
-	shopt -sq extglob
-	find lib/native/linux$(sed 's/_/-/g' <<<${CARCH/#*(i?86|x86)/})/ -maxdepth 1 -type f \
-		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/lib/native/"{} \;
-	find sc-bundles/{,os-specific/linux/} -maxdepth 1 -type f \
-		-execdir install -Dm644 {} "${pkgdir}/usr/lib/${pkgname}/sc-bundles/"{} \;
-	install -Dm755 "$srcdir/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-	install -Dm644 "$srcdir/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	local _file
-	for _file in resources/install/debian/*.{svg,xpm}; do
-		install -Dm644 "$_file" "${pkgdir}/usr/share/pixmaps/${pkgname}${_file/*sip-communicator/}"
-	done
-}
diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh
deleted file mode 100644
index 71dba6a36..000000000
--- a/~emulatorman/jitsi/jitsi.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-CLIENTARGS=""
-uname -m | grep i686 && CLIENTARGS="-client -Xmx256m"
-
-javabin=/usr/bin/java
-
-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
-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"
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
-
-cd $SCDIR
-
-exec $COMMAND $*
-