[Debian-islamic-commits] [SCM] Packaging for Zekr branch, master, updated. 198be048697676922dba7dafebc7607b862856c7
أحمد المحمودي (Ahmed El-Mahmoudy)
aelmahmoudy at users.sourceforge.net
Tue Jan 12 17:55:46 UTC 2010
The following commit has been merged in the master branch:
commit e2c1047ff8ae16a1fbcb251dd6faa2ff42cff3eb
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date: Tue Jan 12 19:49:00 2010 +0200
* New beta release.
* Removed 03_KeyboardShortcut_oldswt.patch and
catch_InvalidTokenOffsetsException.diff patches, as they got applied
upstream.
* Refreshed other patches.
* debian/patches/02_build_xml.patch: removed tritonous-jorbis from build
libs, since it is only needed for Windows, and currently the tritinous
Debian package (See #562584).
* debian/zekr.sh: Added lucene-memory to class-path
diff --git a/debian/changelog b/debian/changelog
index 51f65cd..d765b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-zekr (0.7.5~beta2+repack-1~3.gbp16ee3d) UNRELEASED; urgency=low
+zekr (0.7.5~beta3+repack-1~3.gbp16ee3d) UNRELEASED; urgency=low
** SNAPSHOT build @16ee3d427ede2530eb222b380fc784df00070372 **
@@ -20,8 +20,6 @@ zekr (0.7.5~beta2+repack-1~3.gbp16ee3d) UNRELEASED; urgency=low
+ Changed VM_ARGS value to "-Xms10m -Xmx80m".
* Added a patch 03_mozilla_five_home.diff, to set
'options.browser.useMozilla = true' in res/config/config.properties
- * Added patch 03_KeyboardShortcut_oldswt.patch to make Zekr compatible with
- SWT 3.5
* All relations to ttf-bitstream-vera have been removed (Closes: #461299).
* “msttcorefonts” is not suggested anymore (Closes: #490031).
* debian/zekr.links: added a symbolic link to jquery.js from libjs-jquery
@@ -36,12 +34,12 @@ zekr (0.7.5~beta2+repack-1~3.gbp16ee3d) UNRELEASED; urgency=low
* Use debhelper 7 instead of cdbs
* debian/control:
+ Replace java dependencies in Depends with ${java:Depends}
- + Bump xulrunner dependancy to 1.9.1
+ + Bump xulrunner dependency to 1.9.1
+ Remove browser alternatives from Depends.
- + Bump lucene2 dependancy to >= 2.9.0
+ + Bump lucene2 dependency to >= 2.9.0
* Added build_manifest.diff patch to add Class-Path & Main-Class
attributes to manifest
- * Added debian/install, debian/docs
+ * Added debian/install, debian/docs, debian/README.source
* Add jogg.jar to class path
* debian/control: Added Vcs-* headers
* According to debian/copyright, zekr should be in non-free
@@ -55,7 +53,6 @@ zekr (0.7.5~beta2+repack-1~3.gbp16ee3d) UNRELEASED; urgency=low
* A watch file has been added in 0.7.1-3~ppa5 (Closes: #561732).
[ Mehdi Dogguy ]
- * Add a patch catch_InvalidTokenOffsetsException.diff to fix build issue.
* Set debian-islamic-maintainers as Maintainer and set former
maintainer as an uploader.
* Add myself as an uploader.
diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index 61666a7..160b9bb 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -21,16 +21,16 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
<!-- Excevution tags -->
<property name="debug" value="off" />
-@@ -31,26 +30,27 @@
- <property name="dist_javadocs" value="${builddir}/${javadocsdir}" />
+@@ -32,27 +31,27 @@
<!-- JAR file dependencies -->
-- <property name="swt.jar" value="${libdir}/swt.jar" />
+ <property name="swt.jar" value="${libdir}/swt.jar" />
- <property name="velocity.jar" value="${libdir}/velocity-1.6.2.jar" />
- <property name="log4j.jar" value="${libdir}/log4j-1.2.8.jar" />
-- <property name="lucene-core.jar" value="${libdir}/lucene-core-2.3.2.jar" />
-- <property name="lucene-highlighter.jar" value="${libdir}/lucene-highlighter-2.3.2.jar" />
-- <property name="lucene-snowball.jar" value="${libdir}/lucene-snowball-2.3.2.jar" />
+- <property name="lucene-core.jar" value="${libdir}/lucene-core-3.0.0.jar" />
+- <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="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" />
@@ -41,16 +41,17 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
- <property name="jlayer.jar" value="${libdir}/jlayer-1.0.1.jar" />
- <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="swt.jar" value="/usr/share/java/swt.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" />
@@ -60,21 +61,23 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
+
+ <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-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="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}" />
-@@ -69,16 +69,13 @@
+@@ -72,17 +71,14 @@
<pathelement location="${jlayer.jar}" />
<pathelement location="${basicplayer.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}" />
</path>
@@ -87,7 +90,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 +90,7 @@
+@@ -97,6 +93,7 @@
<target name="dist" depends="compile">
<jar jarfile="${distdir}" basedir="${build_classdir}" />
@@ -95,7 +98,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
</target>
<target name="javadoc" depends="compile">
-@@ -117,6 +115,7 @@
+@@ -121,6 +118,7 @@
<target name="clean">
<delete dir="${builddir}" />
<delete file="${distdir}" />
diff --git a/debian/patches/03_KeyboardShortcut_oldswt.patch b/debian/patches/03_KeyboardShortcut_oldswt.patch
deleted file mode 100644
index d491292..0000000
--- a/debian/patches/03_KeyboardShortcut_oldswt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: src/net/sf/zekr/common/config/KeyboardShortcut.java changed to be
- compatible with swt older than 3.6
-Author: Mohammad Derakhshani <mohammad at zekr.org>
-Index: zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/common/config/KeyboardShortcut.java
-===================================================================
---- zekr-0.7.5~beta2+dfsg.orig/src/net/sf/zekr/common/config/KeyboardShortcut.java 2009-11-29 00:18:00.753826906 -0500
-+++ zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/common/config/KeyboardShortcut.java 2009-11-29 00:18:08.109879827 -0500
-@@ -163,7 +163,7 @@
- break;
- }
- accelStr = accelStr + s;
-- } else if (accKey >= SWT.F1 && accKey <= SWT.F20) { // try function keys
-+ } else if (accKey >= SWT.F1 && accKey <= SWT.F15) { // try function keys
- int f = accKey - SWT.F1 + 1;
- accelStr = combKey + "F" + f;
- } else {
diff --git a/debian/patches/03_mozilla_five_home.diff b/debian/patches/03_mozilla_five_home.diff
index 2f085de..b3b83ce 100644
--- a/debian/patches/03_mozilla_five_home.diff
+++ b/debian/patches/03_mozilla_five_home.diff
@@ -1,10 +1,8 @@
Description: Set 'options.browser.useMozilla = true' in res/config/config.properties
Author: Mohammad Derakhshani <mohammad at zekr.org>
-Index: zekr-0.7.5~beta2+dfsg/res/config/config.properties
-===================================================================
---- zekr-0.7.5~beta2+dfsg.orig/res/config/config.properties 2009-11-28 23:03:50.145752213 -0500
-+++ zekr-0.7.5~beta2+dfsg/res/config/config.properties 2009-11-29 09:45:12.246666055 -0500
-@@ -96,7 +96,7 @@
+--- a/res/config/config.properties
++++ b/res/config/config.properties
+@@ -99,7 +99,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 19b065f..7902256 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 users.sourceforge.net>
--- a/build.xml
+++ b/build.xml
-@@ -89,7 +89,15 @@
+@@ -92,7 +92,15 @@
</target>
<target name="dist" depends="compile">
diff --git a/debian/patches/catch_InvalidTokenOffsetsException.diff b/debian/patches/catch_InvalidTokenOffsetsException.diff
deleted file mode 100644
index daf8660..0000000
--- a/debian/patches/catch_InvalidTokenOffsetsException.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java
-===================================================================
---- zekr-0.7.5~beta2+dfsg.orig/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java 2009-12-27 19:44:19.000000000 +0100
-+++ zekr-0.7.5~beta2+dfsg/src/net/sf/zekr/engine/search/lucene/QuranTextSearcher.java 2009-12-27 19:45:16.000000000 +0100
-@@ -41,6 +41,7 @@
- import org.apache.lucene.search.highlight.Formatter;
- import org.apache.lucene.search.highlight.Highlighter;
- import org.apache.lucene.search.highlight.QueryScorer;
-+import org.apache.lucene.search.highlight.InvalidTokenOffsetsException;
-
- /**
- * @author Mohsen Saboorian
-@@ -151,7 +152,7 @@
- return searchScope;
- }
-
-- public SearchResultModel search(String query) throws IOException, ParseException {
-+ public SearchResultModel search(String query) throws IOException, ParseException, InvalidTokenOffsetsException {
- this.rawQuery = query;
- String s = SearchUtils.simplifyAdvancedSearchQuery(query);
- results = internalSearch(s);
-@@ -169,7 +170,7 @@
- * @throws IOException
- * @throws ParseException
- */
-- private List internalSearch(String q) throws IOException, ParseException {
-+ private List internalSearch(String q) throws IOException, ParseException, InvalidTokenOffsetsException {
- IndexSearcher is = new IndexSearcher(zekrIndexReader.indexReader);
- QueryParser parser = new QueryParser(QuranTextIndexer.CONTENTS_FIELD, analyzer);
-
diff --git a/debian/patches/series b/debian/patches/series
index f80f0f9..4b5def1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
02_build_xml.patch
-03_KeyboardShortcut_oldswt.patch
03_mozilla_five_home.diff
build_manifest.diff
-catch_InvalidTokenOffsetsException.diff
diff --git a/debian/zekr.sh b/debian/zekr.sh
index 1a82a07..e2468c8 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -99,7 +99,7 @@ fi
run () {
MAIN_CLASS=net.sf.zekr.ZekrMain
JRE_OPT=-Djava.library.path=/usr/lib/jni/
-CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-snowball.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
+CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene-highlighter.jar:/usr/share/java/lucene-core.jar:/usr/share/java/lucene-snowball.jar:/usr/share/java/lucene-memory.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
VM_ARGS="-Xms10m -Xmx80m"
"$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $APP_ARGS $*
--
Packaging for Zekr
More information about the Debian-islamic-commits
mailing list