[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. debian/0.7.5+repack-2-13-g26489b7

[أحمد المحمودي (Ahmed El-Mahmoudy)]

The following commit has been merged in the master branch:
commit 26489b7275b3b780dc0daea962b49342eb40b7d2
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Mon Jun 28 17:20:19 2010 +0300

    * zekr.sh:
      + Remove obsolete $workspace/zekr-${version}.debian-lock
        checking logic.
      + Fix a bug introduced during clean up
    * debian/rules: just install zekr.sh directly (sed'ing is not needed
      anymore)

diff --git a/debian/rules b/debian/rules
index 52d5633..5109052 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,7 @@ DEB_FINALDIR=$(CURDIR)/debian/zekr
 
 override_dh_install:
 	dh_install
-	echo "s/^version=".*"/version="${DEB_VERSION}"/ debian/zekr.sh" | xargs sed > $(DEB_FINALDIR)/usr/bin/zekr
-	chmod 755 $(DEB_FINALDIR)/usr/bin/zekr
+	install -m 0755 debian/zekr.sh $(DEB_FINALDIR)/usr/bin/zekr
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/changes.txt
diff --git a/debian/zekr.sh b/debian/zekr.sh
index 480e1f0..23154e1 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-version=""
-
 args=$*
 
 ZEKR_WORKSPACE=~/.zekr
@@ -27,13 +25,7 @@ ZEKR_CONF_FILE=${ZEKR_WORKSPACE}/zekrrc-debian
 # then user configuration file
 [ ! -f ${ZEKR_CONF_FILE} ] || . ${ZEKR_CONF_FILE}
 
-
-if [ ! -f ${ZEKR_WORKSPACE}/${version}.debian-lock ]; then
-  rm ${ZEKR_WORKSPACE}/*debian-lock -f
-  touch ${ZEKR_WORKSPACE}/${version}.debian-lock
-fi
-
-
+# Check if suitable Qur'an font is available:
 if [ ! "${ZEKR_WARNINGS}" = "disable" ]; then
   MEQRN=1
   if [ ! -e /usr/share/fonts/truetype/ttf-me_quran/me_quran_volt_newmet.ttf ]; then
@@ -95,13 +87,13 @@ 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/lucene-memory.jar:/usr/share/java/lucene-misc.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="-Xms10m -Xmx80m ${EXTRA_VM_ARGS}"
 
-"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $args
+"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $*
 }
 
 DIR_NAME=`dirname $0`
 cd $DIR_NAME
 cd ../share/zekr/
 
-run $*
+run $args
 exit 0
 

-- 
Packaging for Zekr