Source: zekr Version: 1.1.0+repack-2.1 Severity: normal User: [email protected] Usertags: default-java9 Tags: patch
This package depends on liblucene2-java, which I'm hoping to RM soon. I don't know the history, but it looks like upstream depend on Lucene 3.0, which would be better for now anyway; it's unclear why the package has been moved back to Lucene 2. Perhaps Lucene 3 wasn't packaged at the time? Now, even Lucene 3 looks pretty old. Attached is a patch to move the build and start scripts to Lucene 3. I was unable to completely test that the patch works, however, as I am unable to start zekr, related to #866659. Cheers, Chris.
>From 9429af636884c39dbb1a1eef77e222b28dbdbe67 Mon Sep 17 00:00:00 2001 From: "Chris West (Faux)" <[email protected]> Date: Mon, 11 Sep 2017 08:56:25 +0100 Subject: [PATCH] switch to lucene 3 --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/patches/02_build_xml.patch | 10 +++++----- debian/zekr.sh | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4a8cab3..25c6e9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zekr (1.1.0+repack-3) UNRELEASED; urgency=medium + + * Switch to liblucene3-java. + + -- Chris West (Faux) <[email protected]> Mon, 11 Sep 2017 09:08:11 +0100 + zekr (1.1.0+repack-2) unstable; urgency=medium * debian/control: diff --git a/debian/control b/debian/control index 86bb5d2..9da2faa 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends-Indep: libcommons-lang-java, libcommons-io-java, liblog4j1.2-java (>= 1.2.8), - liblucene2-java (>= 2.9.0), + liblucene3-java, velocity (>= 1.4), libswt-gtk-3-java, libjlayer-java, diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch index 64f1e93..c628190 100644 --- a/debian/patches/02_build_xml.patch +++ b/debian/patches/02_build_xml.patch @@ -49,11 +49,11 @@ Author: Mohammad Derakhshani <[email protected]> - <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="lucene-misc.jar" value="${libdir}/lucene-misc.jar" /> ++ <property name="lucene-core.jar" value="${libdir}/lucene3-core.jar" /> ++ <property name="lucene-highlighter.jar" value="${libdir}/lucene3-highlighter.jar" /> ++ <property name="lucene-snowball.jar" value="${libdir}/lucene3-analyzers.jar" /> ++ <property name="lucene-memory.jar" value="${libdir}/lucene3-memory.jar" /> ++ <property name="lucene-misc.jar" value="${libdir}/lucene3-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" /> diff --git a/debian/zekr.sh b/debian/zekr.sh index a1bd5dc..20305fa 100644 --- a/debian/zekr.sh +++ b/debian/zekr.sh @@ -94,7 +94,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/lucene-memory.jar:/usr/share/java/lucene-misc.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/lucene3-highlighter.jar:/usr/share/java/lucene3-core.jar:/usr/share/java/lucene3-analyzers.jar:/usr/share/java/lucene3-memory.jar:/usr/share/java/lucene3-misc.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 ${EXTRA_VM_ARGS}" "$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $* -- 2.11.0
