[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. 010e29f5b3094f7759fd8a847da6be9d1faf8550

أحمد المحمودي (Ahmed El-Mahmoudy) aelmahmoudy at users.sourceforge.net
Mon Dec 28 16:09:04 UTC 2009


The following commit has been merged in the master branch:
commit 010e29f5b3094f7759fd8a847da6be9d1faf8550
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Mon Dec 28 17:54:18 2009 +0200

    Removed code for xulrunner detection, also do not define
    org.eclipse.swt.browser.XULRunnerPath, since it is not needed since we
    use libswt-mozilla-gtk.

diff --git a/debian/zekr.sh b/debian/zekr.sh
index 88453ba..1a82a07 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -96,32 +96,11 @@ if [ -n "${ZEKR_JAVA_HOME}" -a -z "${ZEKR_JAVA_CMD}" ]; then
     ZEKR_JAVA_CMD="$ZEKR_JAVA_HOME/bin/java"
 fi
 
-# Detection of xulrunner
-XULRUNNER_PATH=""
-for xulrunner in /usr/bin/xulrunner `find /usr/bin -name "xulrunner-*" | sort -r`; do
-    XULRUNNER_PATH=`$xulrunner --find-gre $($xulrunner --gre-version 2>/dev/null) 2>/dev/null`
-    if [ ! -z "$XULRUNNER_PATH" -a -f "$XULRUNNER_PATH" ]; then
-        XULRUNNER_PATH=`dirname $XULRUNNER_PATH`
-        break
-    fi
-done
-if [ -z "$XULRUNNER_PATH" ]; then
-    echo "Integrated browser support not working"
-    echo "This Zekr build doesn't have support for the integrated browser."
-    echo "This is possibly a bug!"
-    echo "Please report this incident via http://zekr.org/contact.html"
-
-    zenity --error \
-        --title="Integrated browser support not working" \
-        --text="This Zekr build doesn't have support for the integrated browser."
-    exit 1
-fi
-
 run () {
 MAIN_CLASS=net.sf.zekr.ZekrMain
 JRE_OPT=-Djava.library.path=/usr/lib/jni/
 CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-snowball.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
-VM_ARGS="-Dorg.eclipse.swt.browser.XULRunnerPath=$XULRUNNER_PATH -Xms10m -Xmx80m"
+VM_ARGS="-Xms10m -Xmx80m"
 
 "$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $APP_ARGS $*
 }

-- 
Packaging for Zekr



More information about the Debian-islamic-commits mailing list