[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 8031fc6fbc58514b5c56ee013f3686ae57a51dc3
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Tue Dec 1 19:12:07 2009 +0200

    Fixed the jogg addition

diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index cc18759..9c38176 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -1,9 +1,7 @@
 Description: build.xml changed to use ubuntu's library files for compiling
 Author: Mohammad Derakhshani <mohammad at zekr.org>
-Index: zekr-0.7.5~beta2+dfsg/build.xml
-===================================================================
---- zekr-0.7.5~beta2+dfsg.orig/build.xml	2009-11-29 00:15:29.205830029 -0500
-+++ zekr-0.7.5~beta2+dfsg/build.xml	2009-11-29 00:15:33.405686531 -0500
+--- a/build.xml
++++ b/build.xml
 @@ -11,7 +11,7 @@
  
  	<!-- Directory setup -->
@@ -64,14 +62,22 @@ Index: zekr-0.7.5~beta2+dfsg/build.xml
 +    <property name="basicplayer.jar" value="${libdir}/basicplayer.jar" />
 +    <property name="tritonus-share.jar" value="${libdir}/tritonus_share.jar" />
 +	<property name="jorbis.jar" value="${libdir}/jorbis.jar" />
-+	<property name="jorbis.jar" value="${libdir}/jogg.jar" />
++	<property name="jogg.jar" value="${libdir}/jogg.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" />
  
  	<path id="buildlibs">
  		<pathelement location="${log4j.jar}" />
-@@ -77,8 +76,7 @@
+@@ -70,6 +70,7 @@
+         <pathelement location="${basicplayer.jar}" />
+         <pathelement location="${tritonus-share.jar}" />
+         <pathelement location="${jorbis.jar}" />
++        <pathelement location="${jogg.jar}" />
+         <pathelement location="${jspeex.jar}" />
+         <pathelement location="${mp3spi.jar}" />
+         <pathelement location="${voirbisspi.jar}" />
+@@ -77,8 +78,7 @@
  
  	<target name="compile">
          <mkdir dir="${build_classdir}" />
@@ -81,7 +87,7 @@ Index: zekr-0.7.5~beta2+dfsg/build.xml
  		<javac srcdir="${src_dir}" encoding="UTF-8" source="1.5" target="1.5"
  			destdir="${build_classdir}" includes="${packagedir}/**" debug="true"
  			verbose="${verbose}">
-@@ -93,6 +91,7 @@
+@@ -93,6 +93,7 @@
  
  	<target name="dist" depends="compile">
  		<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -89,7 +95,7 @@ Index: zekr-0.7.5~beta2+dfsg/build.xml
  	</target>
  
  	<target name="javadoc" depends="compile">
-@@ -117,6 +116,7 @@
+@@ -117,6 +118,7 @@
  	<target name="clean">
  		<delete dir="${builddir}" />
  		<delete file="${distdir}" />

-- 
Packaging for Zekr