[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. 5ab087534a62630879c284c164b23a7dfbd9d925

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

The following commit has been merged in the master branch:
commit 5ab087534a62630879c284c164b23a7dfbd9d925
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Thu Dec 3 10:17:06 2009 +0200

    debian/control, debian/patches/02_build_xml.patch: Don't build against libjorbis-java, libjspeex-java
    debian/zekr.sh: set class-path variable to all symlink class files in
      /usr/share/java

diff --git a/debian/control b/debian/control
index e3386de..02278f1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,7 @@ Build-Depends-Indep: ant, default-jdk-builddep,
  liblucene2-java (>= 2.3.0), velocity (>= 1.4), 
  libswt-gtk-3.5-java (<< 3.5.1+repack~), libcommons-codec-java, 
  libjlayer-java, libcommons-codec-java, libbasicplayer-java, libtritonus-java,
- libjorbis-java, libjspeex-java, libmp3spi-java, libvorbisspi-java, 
- javahelper
+ libmp3spi-java, libvorbisspi-java, javahelper
 Build-Depends: debhelper (>= 7.3.3~)
 Standards-Version: 3.8.3
 Homepage: http://www.zekr.org
@@ -23,7 +22,7 @@ Depends: ${misc:Depends}, ${java:Depends}, libswt-cairo-gtk-3.5-jni,
  libswt-gtk-3.5-java (<< 3.5.1+repack~), libswt-gtk-3.5-jni (<< 3.5.1+repack~),
  ttf-sil-scheherazade | ttf-kacst (>= 1.6.2+mry-1) | ttf-farsiweb,
  xulrunner-1.9 (>= 1.9~b3) | firefox | libxul0d | iceape-browser | seamonkey-browser
-Recommends: ttf-freefont | ttf-dejavu
+Recommends: ttf-freefont | ttf-dejavu, libmp3spi-java, libvorbisspi-java, libjorbis-java, libjspeex-java
 Suggests: zekr-quran-translation, zekr-quran-recitation, ttf-me-quran
 Provides:
  zekr-quran-recitation-online-minshawi,
diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index 9c38176..61666a7 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -69,15 +69,15 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  
  	<path id="buildlibs">
  		<pathelement location="${log4j.jar}" />
-@@ -70,6 +70,7 @@
+@@ -69,16 +69,13 @@
+         <pathelement location="${jlayer.jar}" />
          <pathelement location="${basicplayer.jar}" />
          <pathelement location="${tritonus-share.jar}" />
-         <pathelement location="${jorbis.jar}" />
-+        <pathelement location="${jogg.jar}" />
-         <pathelement location="${jspeex.jar}" />
+-        <pathelement location="${jorbis.jar}" />
+-        <pathelement location="${jspeex.jar}" />
          <pathelement location="${mp3spi.jar}" />
          <pathelement location="${voirbisspi.jar}" />
-@@ -77,8 +78,7 @@
+ 	</path>
  
  	<target name="compile">
          <mkdir dir="${build_classdir}" />
@@ -87,7 +87,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  		<javac srcdir="${src_dir}" encoding="UTF-8" source="1.5" target="1.5"
  			destdir="${build_classdir}" includes="${packagedir}/**" debug="true"
  			verbose="${verbose}">
-@@ -93,6 +93,7 @@
+@@ -93,6 +90,7 @@
  
  	<target name="dist" depends="compile">
  		<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -95,7 +95,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  	</target>
  
  	<target name="javadoc" depends="compile">
-@@ -117,6 +118,7 @@
+@@ -117,6 +115,7 @@
  	<target name="clean">
  		<delete dir="${builddir}" />
  		<delete file="${distdir}" />
diff --git a/debian/zekr.sh b/debian/zekr.sh
index 1ed59f8..859d295 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -150,7 +150,9 @@ run () {
 JRE_OPT=-Djava.library.path=/usr/lib/jni/
 VM_ARGS="-Dorg.eclipse.swt.browser.XULRunnerPath=/usr/lib/xulrunner-1.9.1.5 -Xms10m -Xmx80m"
 
-"$ZEKR_JAVA_CMD" $VM_ARGS $JRE_OPT -jar dist/zekr.jar $APP_ARGS $*
+CLASS_PATH=$(for i in /usr/share/java/*.jar; do [ ! -h $i ] || echo -n $i: ; done)
+
+"$ZEKR_JAVA_CMD" $VM_ARGS $JRE_OPT -cp $CLASS_PATH -jar dist/zekr.jar $APP_ARGS $*
 }
 
 DIR_NAME=`dirname $0`

-- 
Packaging for Zekr