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

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

The following commit has been merged in the master branch:
commit a03615388d1217e5601ce808c7b5646b72f674fa
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date:   Tue Jun 22 09:57:23 2010 +0300

    Refreshed patches

diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index 503c8ec..645bdc9 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -21,7 +21,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  
  	<!-- Excevution tags -->
  	<property name="debug" value="off" />
-@@ -32,27 +31,27 @@
+@@ -32,28 +31,28 @@
  
  	<!-- JAR file dependencies -->
  	<property name="swt.jar" value="${libdir}/swt.jar" />
@@ -31,6 +31,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
 -	<property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter-3.0.0.jar" />
 -	<property name="lucene-snowball.jar" value="${libdir}/lucene-snowball-3.0.0.jar" />
 -	<property name="lucene-memory.jar" value="${libdir}/lucene-memory-3.0.0.jar" />
+-	<property name="lucene-misc.jar" value="${libdir}/lucene-misc-3.0.0.jar" />
 -	<property name="commons-logging.jar" value="${libdir}/commons-logging-1.0.4.jar" />
 -	<property name="commons-lang.jar" value="${libdir}/commons-lang-2.4.jar" />
 -	<property name="commons-io.jar" value="${libdir}/commons-io-1.4.jar" />
@@ -46,31 +47,32 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
 -    <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}/jl.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" />

++	<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="lucene-misc.jar" value="${libdir}/lucene-misc.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}" />
-@@ -74,15 +73,11 @@
+@@ -76,15 +75,11 @@
          <pathelement location="${voirbisspi.jar}" />
          <pathelement location="${mp3spi.jar}" />
          <pathelement location="${tritonus-share.jar}" />
@@ -87,7 +89,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}">
-@@ -97,6 +92,7 @@
+@@ -99,6 +94,7 @@
  
  	<target name="dist" depends="compile">
  		<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -95,7 +97,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  	</target>
  
  	<target name="javadoc" depends="compile">
-@@ -121,6 +117,7 @@
+@@ -123,6 +119,7 @@
  	<target name="clean">
  		<delete dir="${builddir}" />
  		<delete file="${distdir}" />
diff --git a/debian/patches/03_mozilla_five_home.diff b/debian/patches/03_mozilla_five_home.diff
index 577588c..d49370c 100644
--- a/debian/patches/03_mozilla_five_home.diff
+++ b/debian/patches/03_mozilla_five_home.diff
@@ -2,7 +2,7 @@ Description: Set 'options.browser.useMozilla = true' in res/config/config.proper
 Author: Mohammad Derakhshani <mohammad at zekr.org>
 --- a/res/config/config.properties
 +++ b/res/config/config.properties
-@@ -112,7 +112,7 @@
+@@ -120,7 +120,7 @@
  options.general.resizeableTaskPane = false
  options.search.maxResult = 40
  options.search.maxResult.maxSpinner = 9999
diff --git a/debian/patches/build_manifest.diff b/debian/patches/build_manifest.diff
index 2c251c5..d53ba61 100644
--- a/debian/patches/build_manifest.diff
+++ b/debian/patches/build_manifest.diff
@@ -3,7 +3,7 @@ Forwarded: yes
 Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
 --- a/build.xml
 +++ b/build.xml
-@@ -92,7 +92,15 @@
+@@ -93,7 +93,15 @@
  	</target>
  
  	<target name="dist" depends="compile">

-- 
Packaging for Zekr