[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. debian/1.0.0+repack-7-6-ge863058
أحمد المحمو =?UTF-8?Q?=D8=AF=D9=8A=20?=(Ahmed El-Mahmoudy)
aelmahmoudy at sabily.org
Sat Jul 14 08:39:35 UTC 2012
The following commit has been merged in the master branch:
commit d4981f5d1618073117aec58247acc7123dfd51aa
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>
Date: Sat Jul 14 09:04:35 2012 +0200
Refresh patches
diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index fe4a729..64f1e93 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -70,26 +70,28 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
+ <property name="jspeex.jar" value="${libdir}/jspeex.jar" />
+ <property name="jorbis.jar" value="${libdir}/jorbis.jar" />
- <path id="buildlibs">
- <pathelement location="${log4j.jar}" />
-@@ -76,15 +75,11 @@
+ <property name="jintellitype.jar" value="${libdir}/jintellitype-1.3.8.jar" />
+
+@@ -78,17 +77,13 @@
<pathelement location="${voirbisspi.jar}" />
<pathelement location="${mp3spi.jar}" />
<pathelement location="${tritonus-share.jar}" />
- <pathelement location="${tritonus-jorbis.jar}" />
- <pathelement location="${jspeex.jar}" />
- <pathelement location="${jorbis.jar}" />
+
+ <pathelement location="${jintellitype.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}">
-@@ -99,6 +94,7 @@
+@@ -103,6 +98,7 @@
<target name="dist" depends="compile">
<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -97,7 +99,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
</target>
<target name="javadoc" depends="compile">
-@@ -123,6 +119,7 @@
+@@ -127,6 +123,7 @@
<target name="clean">
<delete dir="${builddir}" />
<delete file="${distdir}" />
diff --git a/debian/patches/build_manifest.diff b/debian/patches/build_manifest.diff
index d53ba61..8aea4c0 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
-@@ -93,7 +93,15 @@
+@@ -97,7 +97,15 @@
</target>
<target name="dist" depends="compile">
--
Packaging for Zekr
More information about the Debian-islamic-commits
mailing list