tags 390634 + patch thanks On Mon, 02 Oct 2006 12:26:22 +0300, Timo Juhani Lindfors wrote:
> I just noticed that the caudium package includes > /usr/lib/caudium/etc/classes/lucene-1.2.jar [..] > I'm not sure but I think > this violates DFSG #2 Agreed. As liblucene-java exists as a Debian package I think using this pacakge solves the problem. Find attached a patch that tries to implement the usage of liblucene-java instead of the pre-compiled jar (no extensive testing, no warranty). gregor -- .''`. http://info.comodo.priv.at/ | gpg key ID: 0x00F3CFE4 : :' : debian: the universal operating system - http://www.debian.org/ `. `' member of https://www.vibe.at/ | how to reply: http://got.to/quote/ `- NP: The Who: Happy Jack
diff -u caudium-1.4.7/server/start-caudium.in
caudium-1.4.7/server/start-caudium.in
--- caudium-1.4.7/server/start-caudium.in
+++ caudium-1.4.7/server/start-caudium.in
@@ -102,7 +102,7 @@
"CAUDIUM_WATCHDOG_SOCKET" : getenv("CAUDIUM_WATCHDOG_SOCKET") ||
("/tmp/caudium_watchdog_socket_" + uniq_watchdog_id()),
"CLASSPATH" : (getenv("CLASSPATH")?getenv("CLASSPATH") +":":"") +
(getenv("JAVA_HOME")?getenv("JAVA_HOME") +"/lib/tools.jar:":"") +
- ("etc/classes:etc/classes/caudium_search.jar:etc/classes/lucene_1.2.jar:"
+
("etc/classes:etc/classes/caudium_search.jar:/usr/share/java/lucene-1.4.3.jar:"
"etc/classes/caudium_module.jar:etc/classes/caudium_servlet.jar:etc/classes/servlet.jar:etc/classes/jsdk.jar"),
"PIKE_MODULE_PATH" : getenv("PIKE_MODULE_PATH") || "",
"CAUDIUM_LANG" : getenv("CAUDIUM_LANG") || "en"
diff -u caudium-1.4.7/debian/changelog caudium-1.4.7/debian/changelog
--- caudium-1.4.7/debian/changelog
+++ caudium-1.4.7/debian/changelog
@@ -1,3 +1,10 @@
+caudium (2:1.4.7-15.1) unstable; urgency=low
+
+ * NMU.
+ * Use liblucene-java instead of pre-packaged lucene-1.2.jar (closes:
#390634).
+
+ -- gregor herrmann <[EMAIL PROTECTED]> Sun, 15 Oct 2006 10:47:06 +0200
+
caudium (2:1.4.7-15) unstable; urgency=low
* New Pike version dependency
diff -u caudium-1.4.7/debian/control caudium-1.4.7/debian/control
--- caudium-1.4.7/debian/control
+++ caudium-1.4.7/debian/control
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Marek Habersack <[EMAIL PROTECTED]>
Standards-Version: 3.6.2.1
-Build-Depends: debhelper (>> 4.1.16), pike7.6-dev (>= 7.6.87-1),
debconf-utils, libpcre3-dev, libsablot0-dev, libxmltok1-dev, debconf (>=
0.2.26), sharutils, autoconf (>> 2.53), perl (>=5.8.0), libmhash-dev
+Build-Depends: debhelper (>> 4.1.16), pike7.6-dev (>= 7.6.87-1),
debconf-utils, libpcre3-dev, libsablot0-dev, libxmltok1-dev, debconf (>=
0.2.26), sharutils, autoconf (>> 2.53), perl (>=5.8.0), libmhash-dev,
liblucene-java
Package: caudium
Architecture: any
Pre-Depends: debconf (>= 0.2.26) | debconf-2.0
-Depends: ${shlibs:Depends}, ${pike:name}-core (>= ${pike:ver}-1),
${pike:name}-core (<= ${pike:ver}-99), caudium-modules (= ${Source-Version}),
${pike:name}-image (>= ${pike:ver}-1), ${pike:name}-image (<= ${pike:ver}-99),
${pike:name}-pcre, ttf-bitstream-vera
+Depends: ${shlibs:Depends}, ${pike:name}-core (>= ${pike:ver}-1),
${pike:name}-core (<= ${pike:ver}-99), caudium-modules (= ${Source-Version}),
${pike:name}-image (>= ${pike:ver}-1), ${pike:name}-image (<= ${pike:ver}-99),
${pike:name}-pcre, ttf-bitstream-vera, liblucene-java
Suggests: roxen-doc (>= 1.3.122-1), logrotate
Recommends: caudium-pixsl, caudium-ultralog, mime-support
Provides: httpd, httpd-cgi
diff -u caudium-1.4.7/debian/rules caudium-1.4.7/debian/rules
--- caudium-1.4.7/debian/rules
+++ caudium-1.4.7/debian/rules
@@ -212,6 +212,9 @@
usr/lib/caudium/ \
$(CURDIR)/debian/$$p/) ; \
done
+
+ # remove lucene-*.jar
+ rm debian/caudium/usr/lib/caudium$(EXTVER)/etc/classes/lucene-*.jar
# Build architecture-independent files here.
only in patch2:
unchanged:
--- caudium-1.4.7.orig/src/java/classes/Makefile
+++ caudium-1.4.7/src/java/classes/Makefile
@@ -1,7 +1,7 @@
CLASSDIR= ../../../server/etc/classes
-CLASSPATH = ${CLASSDIR}/servlet.jar:${CLASSDIR}/lucene-1.2.jar
+CLASSPATH = ${CLASSDIR}/servlet.jar:/usr/share/java/lucene-1.4.3.jar
JAVAFLAGS = -deprecation -encoding iso-8859-1
signature.asc
Description: Digital signature
