Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

8 files changed, 199 insertions, 70 deletions

diff --git a/~emulatorman/jitsi-stable/PKGBUILD b/~emulatorman/jitsi-stable/PKGBUILD
deleted file mode 100644
index 9cb7018a9..000000000
--- a/~emulatorman/jitsi-stable/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# Contributor: Ananda Samaddar ananda@samaddar.co.uk
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: atommix aka Aleks Lifey <Aleks.Lifey@gmail.com>
-# Contributor: Keshav P R <(skodabenz) (aatt) (rocketmail) (ddoott) (ccoomm)>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
-
-_pkgname=jitsi
-pkgname=$_pkgname-stable
-pkgver=1.0.beta1.3820
-pkgrel=1
-pkgdesc="An audio/video/chat communicator that supports protocols such as SIP and XMPP/Jabber"
-arch=('i686' 'x86_64')
-url="http://jitsi.org"
-license=('LGPL')
-depends=('openjdk6')
-makedepends=('apache-ant' 'openjdk6')
-provides=("$_pkgname=$pkver")
-conflicts=("$_pkgname")
-options=(!strip !emptydirs zipman !libtool docs)
-source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-beta1-nightly.build.${pkgver##*.}.zip"
-        $_pkgname.{desktop,sh})
-md5sums=('a5675da30e2e5fd801d2457ddddba0f9'
-         '5923eeca35823f8ef1e416a9a6fc0fac'
-         '55fe144bbf19283e7ec5d7bd3228cf5b')
-sha256sums=('74d845b993cdd53856415a179ac72bbe9c6f5db37482874eab7be34490e7c0c2'
-            '770132b617d94ed468e9592b991ceac10eb3e03e7198b8f5f2f05918f7db4302'
-            '98027ddaa1ebfe948fa49f6e57ab0d2c866d5e7c37873e30638b86223a2a15e9')
-
-# uncomment to get the latest stable release; you have to adjust/skip checksums
-#source[0]=http://download.jitsi.org/jitsi/src/$(curl -Ss 'http://download.jitsi.org/jitsi/src/' | grep -om1 'jitsi-src[^"<]\+.zip' | head -1)
-#pkgver=$(sed -r 's/[^0-9]*([0-9.]+)(-(beta[0-9]+))?.*(.build.([0-9]+))\..*/\1.\3.\5/' <<<${source[0]})
-
-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/PKGBUILD b/~emulatorman/jitsi/PKGBUILD
new file mode 100644
index 000000000..5d8a2e4cb
--- /dev/null
+++ b/~emulatorman/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
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+pkgname=jitsi
+pkgver=1.0.3967
+pkgrel=1
+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'
+	'c75c74f41e613a7d17bf2f1f310adee3')
+
+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-stable/jitsi.desktop b/~emulatorman/jitsi/jitsi.desktop
index f0a7b5436..dd4de82a6 100644
--- a/~emulatorman/jitsi-stable/jitsi.desktop
+++ b/~emulatorman/jitsi/jitsi.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Jitsi
 GenericName=jitsi
 Comment=VoIP and Instant Messaging client
 Icon=/usr/share/pixmaps/jitsi.svg
 Type=Application
-Categories=Network;
+Categories=Network
 Exec=/usr/bin/jitsi
 Terminal=false
diff --git a/~emulatorman/jitsi-stable/jitsi.sh b/~emulatorman/jitsi/jitsi.sh
index 6ebd6131f..c78c69f2f 100644
--- a/~emulatorman/jitsi-stable/jitsi.sh
+++ b/~emulatorman/jitsi/jitsi.sh
@@ -1,19 +1,20 @@
 #!/bin/bash
 
-# Additionnal JVM arguments
 CLIENTARGS=""
-[[ $(uname -m) =~ i?86 ]] && CLIENTARGS="-client -Xmx256m"
+arch | grep i686 && CLIENTARGS="-client -Xmx256m"
+
+javabin=${JAVA_HOME}/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="$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"
+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"
 
-# set add LIBPATH to LD_LIBRARY_PATH for any sc natives (e.g. jmf .so's)
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIBPATH/native
 
 cd $SCDIR
 
 exec $COMMAND $*
+
diff --git a/~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch b/~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch
new file mode 100644
index 000000000..870a2670a
--- /dev/null
+++ b/~emulatorman/timekpr/Initializes_lastNotified_before_it_is_used.patch
@@ -0,0 +1,10 @@
+--- a/timekpr-client.py	2011-04-15 13:17:59.000000000 +0200
++++ b/timekpr-client.py	2011-04-15 13:19:06.000000000 +0200
+@@ -40,6 +40,7 @@
+         self.conffile = self.VAR['TIMEKPRDIR'] + '/' + self.username
+         self.limits, self.bfrom, self.bto = readusersettings(self.username, self.conffile)
+         self.timer = None
++        self.lastNotified = datetime.datetime.fromtimestamp(0);
+         self.checkLimits()
+         #Add a gobject loop to check limits:
+         self.timer = gobject.timeout_add(self.checkInterval * 1000, self.checkLimits)
diff --git a/~emulatorman/timekpr/PKGBUILD b/~emulatorman/timekpr/PKGBUILD
new file mode 100644
index 000000000..2196dd275
--- /dev/null
+++ b/~emulatorman/timekpr/PKGBUILD
@@ -0,0 +1,74 @@
+# Contributor: SanskritFritz (gmail)
+
+pkgname=timekpr
+pkgver=0.3.2
+pkgrel=8
+pkgdesc="Control the computer usage of your user accounts. You can limit their daily usage based on a timed access duration and configure periods of day when they can log in."
+arch=('i686' 'x86_64')
+url=https://launchpad.net/timekpr
+license=('GPL')
+depends=('python2')
+source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/${pkgname}_${pkgver}~ppa1~ubuntu2.tar.gz
+        timekprd.sh
+	Initializes_lastNotified_before_it_is_used.patch)
+install='timekpr.install'
+md5sums=('0626ee6b6b6d218dfdd6e79331f789a2'
+         'ab37e469034200c19b46a31d586bfe3e'
+         '23848ef2578571d7dc4871fbd15f41ed')
+
+
+build() {
+	cd ${srcdir}/stable/gui/client
+	# https://bugs.launchpad.net/timekpr/+bug/761647
+	patch -p1 < ${srcdir}/Initializes_lastNotified_before_it_is_used.patch
+}
+
+package() {
+	install -dm755 $pkgdir/etc/{rc.d,timekpr,logrotate.d,xdg/autostart}
+	install -dm755 $pkgdir/usr/{bin,share/{doc/timekpr,timekpr,python-support/timekpr,pixmaps,applications,man/man8}}
+	install -dm755 $pkgdir/usr/share/locale/{da,de,fr,hu,nb,sv,fi}/LC_MESSAGES
+	install -dm755 $pkgdir/var/lib/timekpr
+
+	cd $srcdir/stable
+	install -m644 etc/timekpr.conf $pkgdir/etc/
+	install -m644 etc/logrotate.d/timekpr $pkgdir/etc/logrotate.d/
+	sed -i "s/python/python2/" timekpr
+	install -m755 timekpr $pkgdir/usr/bin/
+	sed -i "s/python/python2/" timekpr-gui
+	install -m755 timekpr-gui $pkgdir/usr/bin/
+	sed -i "s/python/python2/" timekpr-client
+	install -m755 timekpr-client $pkgdir/usr/bin/
+	install -m755 timekprpam.py $pkgdir/usr/share/python-support/timekpr/
+	install -m755 timekpr.py $pkgdir/usr/share/python-support/timekpr/
+	install -m755 timekpr-gui.py $pkgdir/usr/share/python-support/timekpr/
+	install -m755 gui/client/timekpr-client.py $pkgdir/usr/share/python-support/timekpr/
+	install -m755 timekprpam.py $pkgdir/usr/share/python-support/timekpr/
+	install -m755 timekprcommon.py $pkgdir/usr/share/python-support/timekpr/
+	install -m644 gui/padlock-green.png $pkgdir/usr/share/timekpr/
+	install -m644 gui/padlock-red.png $pkgdir/usr/share/timekpr/
+	install -m644 gui/timekpr.glade $pkgdir/usr/share/timekpr/
+	install -m644 gui/timekpr100x100.png $pkgdir/usr/share/timekpr/
+	install -m644 gui/timekpr32x32.png $pkgdir/usr/share/timekpr/
+	install -m644 gui/timekpr.xpm $pkgdir/usr/share/pixmaps/
+	install -m644 debian/timekpr.desktop $pkgdir/usr/share/applications/
+	install -m644 debian/timekpr-client.desktop $pkgdir/etc/xdg/autostart
+	install -m644 locale/da/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/da/LC_MESSAGES/
+	install -m644 locale/de/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/de/LC_MESSAGES/
+	install -m644 locale/fr/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/fr/LC_MESSAGES/
+	install -m644 locale/hu/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/hu/LC_MESSAGES/
+	install -m644 locale/nb/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/nb/LC_MESSAGES/
+	install -m644 locale/sv/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/sv/LC_MESSAGES/
+	install -m644 locale/fi/LC_MESSAGES/timekpr.mo $pkgdir/usr/share/locale/fi/LC_MESSAGES/
+	install -m644 TODO.txt $pkgdir/usr/share/doc/timekpr
+	install -m644 README.txt $pkgdir/usr/share/doc/timekpr
+	install -m644 COPYRIGHT.txt $pkgdir/usr/share/doc/timekpr
+	install -m644 CONTRIBUTORS.txt $pkgdir/usr/share/doc/timekpr
+	install -m644 debian/changelog $pkgdir/usr/share/doc/timekpr
+	install -m644 doc/timekpr.8 $pkgdir/usr/share/man/man8
+
+	install -m755 debian/timekpr.postrm $pkgdir/usr/bin/
+	install -m755 debian/timekpr.postinst $pkgdir/usr/bin/
+
+	cd $srcdir
+	install -m755 timekprd.sh $pkgdir/etc/rc.d/timekprd
+}
diff --git a/~emulatorman/timekpr/timekpr.install b/~emulatorman/timekpr/timekpr.install
new file mode 100644
index 000000000..b01769c48
--- /dev/null
+++ b/~emulatorman/timekpr/timekpr.install
@@ -0,0 +1,24 @@
+
+post_install() {
+	/usr/bin/timekpr.postinst
+
+	echo "Your su command (gksu|gksudo|kdesu|kdesudo etc) for starting timekpr-gui as root: "
+	read su_command;
+	sed -i "s/gksu/${su_command}/" "/usr/share/applications/timekpr.desktop"
+
+	echo
+	echo "Start the timekpr daemon with '/etc/rc.d/timekprd start'"
+	echo "For permanent use put 'timekprd' into your DAEMONS array."
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	/usr/bin/timekpr.postrm purge
+}
+
+post_remove() {
+	echo "Remove the timekprd entry from your DAEMONS array."
+}
diff --git a/~emulatorman/timekpr/timekprd.sh b/~emulatorman/timekpr/timekprd.sh
new file mode 100755
index 000000000..19e4a3af4
--- /dev/null
+++ b/~emulatorman/timekpr/timekprd.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -x -o %PPID /etc/rc.d/timekprd`
+case "$1" in
+  start)
+    stat_busy "Starting timekpr"
+    [ -z "$PID" ] && /usr/bin/timekpr &
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon timekprd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping timekpr"
+    [ ! -z "$PID" ] && killall --user root timekpr &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon timekprd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"
+esac
+exit 0