[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. debian/0.7.5.beta4+repack-1-8-gcfa9c9f

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

The following commit has been merged in the master branch:
commit b98a63354b2964c2a888afc1c748d8e232a002bc
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Fri Apr 23 08:52:06 2010 +0200

    Refreshed patch 02_build_xml.patch

diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index 4c7d42f..5c71bc1 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -42,55 +42,52 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
 -    <property name="basicplayer.jar" value="${libdir}/basicplayer-3.0.jar" />
 -    <property name="tritonus-share.jar" value="${libdir}/tritonus-share-0.3.6.jar" />
 -	<property name="tritonus-jorbis.jar" value="${libdir}/tritonus-jorbis-0.3.6.jar" />
--	<property name="jorbis.jar" value="${libdir}/jorbis-0.0.17.jar" />
--	<property name="jspeex.jar" value="${libdir}/jspeex-0.9.7.jar" />
--    <property name="mp3spi.jar" value="${libdir}/mp3spi-1.9.4.jar" />
 -    <property name="voirbisspi.jar" value="${libdir}/vorbisspi-1.0.3.jar" />
-+	<property name="velocity.jar" value="${libdir}/velocity.jar" />
-+	<property name="log4j.jar" value="${libdir}/log4j-1.2.jar" />
-+	<property name="lucene-core.jar" value="${libdir}/lucene-core.jar" />
-+	<property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter.jar" />
-+	<property name="lucene-snowball.jar" value="${libdir}/lucene-snowball.jar" />
-+	<property name="lucene-memory.jar" value="${libdir}/lucene-memory.jar" />
-+	<property name="commons-logging.jar" value="${libdir}/commons-logging.jar" />
-+	<property name="commons-lang.jar" value="${libdir}/commons-lang.jar" />
-+	<property name="commons-io.jar" value="${libdir}/commons-io.jar" />
-+	<property name="commons-collections.jar" value="${libdir}/commons-collections3.jar" />
-+	<property name="commons-codec.jar" value="${libdir}/commons-codec.jar" />
-+    <property name="commons-configuration.jar" value="${libdir}/commons-configuration.jar" />
-+
-+    <property name="jlayer.jar" value="${libdir}/jlayer.jar" />
-+    <property name="basicplayer.jar" value="${libdir}/basicplayer.jar" />
-+    <property name="tritonus-share.jar" value="${libdir}/tritonus_share.jar" />
-+	<property name="tritonus-jorbis.jar" value="${libdir}/tritonus-jorbis.jar" />
-+	<property name="jorbis.jar" value="${libdir}/jorbis.jar" />
-+	<property name="jspeex.jar" value="${libdir}/jspeex.jar" />
-+    <property name="mp3spi.jar" value="${libdir}/mp3spi.jar" />
-+    <property name="voirbisspi.jar" value="${libdir}/vorbisspi.jar" />
+-    <property name="mp3spi.jar" value="${libdir}/mp3spi-1.9.4.jar" />
+-	<property name="jspeex.jar" value="${libdir}/jspeex-0.9.7.jar" />
+-	<property name="jorbis.jar" value="${libdir}/jorbis-0.0.17.jar" />
++	<property name="velocity.jar" value="${libdir}/velocity.jar" />

++	<property name="log4j.jar" value="${libdir}/log4j-1.2.jar" />

++	<property name="lucene-core.jar" value="${libdir}/lucene-core.jar" />

++	<property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter.jar" />

++	<property name="lucene-snowball.jar" value="${libdir}/lucene-snowball.jar" />

++	<property name="lucene-memory.jar" value="${libdir}/lucene-memory.jar" />

++	<property name="commons-logging.jar" value="${libdir}/commons-logging.jar" />

++	<property name="commons-lang.jar" value="${libdir}/commons-lang.jar" />

++	<property name="commons-io.jar" value="${libdir}/commons-io.jar" />

++	<property name="commons-collections.jar" value="${libdir}/commons-collections3.jar" />

++	<property name="commons-codec.jar" value="${libdir}/commons-codec.jar" />

++    <property name="commons-configuration.jar" value="${libdir}/commons-configuration.jar" />

++

++    <property name="jlayer.jar" value="${libdir}/jlayer.jar" />

++    <property name="basicplayer.jar" value="${libdir}/basicplayer.jar" />

++    <property name="tritonus-share.jar" value="${libdir}/tritonus_share.jar" />

++	<property name="tritonus-jorbis.jar" value="${libdir}/tritonus-jorbis.jar" />

++    <property name="voirbisspi.jar" value="${libdir}/vorbisspi.jar" />

++    <property name="mp3spi.jar" value="${libdir}/mp3spi.jar" />

++	<property name="jspeex.jar" value="${libdir}/jspeex.jar" />

++	<property name="jorbis.jar" value="${libdir}/jorbis.jar" />

  
  	<path id="buildlibs">
  		<pathelement location="${log4j.jar}" />
-@@ -72,17 +71,14 @@
-         <pathelement location="${jlayer.jar}" />
-         <pathelement location="${basicplayer.jar}" />
+@@ -74,15 +73,11 @@
+         <pathelement location="${voirbisspi.jar}" />
+         <pathelement location="${mp3spi.jar}" />
          <pathelement location="${tritonus-share.jar}" />
 -		<pathelement location="${tritonus-jorbis.jar}" />
--        <pathelement location="${jorbis.jar}" />
 -        <pathelement location="${jspeex.jar}" />
-+<!--		<pathelement location="${tritonus-jorbis.jar}" /> -->
-         <pathelement location="${mp3spi.jar}" />
-         <pathelement location="${voirbisspi.jar}" />
+-        <pathelement location="${jorbis.jar}" />
  	</path>
  
  	<target name="compile">
          <mkdir dir="${build_classdir}" />
 -		<unjar src="${src_dist.jar}" dest="${src_dir}">
 -		</unjar>
-+	<mkdir dir="dist" />
++        <mkdir dir="dist" />

  		<javac srcdir="${src_dir}" encoding="UTF-8" source="1.5" target="1.5"
  			destdir="${build_classdir}" includes="${packagedir}/**" debug="true"
  			verbose="${verbose}">
-@@ -97,6 +93,7 @@
+@@ -97,6 +92,7 @@
  
  	<target name="dist" depends="compile">
  		<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -98,7 +95,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  	</target>
  
  	<target name="javadoc" depends="compile">
-@@ -121,6 +118,7 @@
+@@ -121,6 +117,7 @@
  	<target name="clean">
  		<delete dir="${builddir}" />
  		<delete file="${distdir}" />

-- 
Packaging for Zekr