Package: jmeter
Version: 2.0.0-3
Severity: serious
Tags: patch
When building 'jmeter' on unstable, I get the following error:
p -r build-tree/jakarta-jmeter-2.0.0/bin debian/tmp/usr/share/jmeter
install -m 755 debian/bin/jmeter debian/tmp/usr/bin
mkdir -p debian/tmp/usr/share/jmeter/printable_docs/
cp -ar build-tree/jakarta-jmeter-2.0.0/docs/usermanual
debian/tmp/usr/share/jmeter/printable_docs/
cp: cannot stat `build-tree/jakarta-jmeter-2.0.0/docs/usermanual': No such file
or directory
make: *** [binary-indep] Error 1
This can be fixed by changing 'docs/usermanual' to 'xdocs/usermanual'.
With the attached patch 'jmeter' can be compiled on unstable.
The patch also changes the Build-Depends and JAVA_HOME/CLASSPATH to
use the standard name and directories from java-package.
Regards
Andreas Jochens
diff -urN ../tmp-orig/jmeter-2.0.0/debian/control ./debian/control
--- ../tmp-orig/jmeter-2.0.0/debian/control 2005-09-08 09:50:27.000000000
+0000
+++ ./debian/control 2005-09-08 09:38:03.000000000 +0000
@@ -2,7 +2,7 @@
Section: contrib/net
Priority: optional
Maintainer: Takashi Okamoto <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 2.1.0), sun-j2sdk1.4debian, ant (>=1.3),
libavalon-framework-java, libavalon-excalibur-java, libxerces-java |
libxerces2-java, liblog4j1.2-java, liboro-java, libxalan2-java, bsh, libbsf-java
+Build-Depends-Indep: debhelper, sun-j2sdk1.5, ant, libavalon-framework-java,
libavalon-excalibur-java, libxerces-java | libxerces2-java, liblog4j1.2-java,
liboro-java, libxalan2-java, bsh, libbsf-java
Standards-Version: 3.5.8
Package: jmeter
diff -urN ../tmp-orig/jmeter-2.0.0/debian/rules ./debian/rules
--- ../tmp-orig/jmeter-2.0.0/debian/rules 2005-09-08 09:50:27.000000000
+0000
+++ ./debian/rules 2005-09-08 09:50:23.000000000 +0000
@@ -5,10 +5,10 @@
package=jmeter
-CLASSPATH=/usr/lib/j2re1.3/lib/rt.jar:/home/tora/tmp/jakarta-velocity/bin/velocity-1.4-dev.jar:/usr/share/java/oro.jar:/usr/share/java/xerces.jar:/usr/share/java/junit.jar:/usr/share/java/log4j.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/avalon-excalibur.jar:/usr/share/java/regexp.jar:/usr/share/ant1.6/lib/ant.jar:/usr/share/ant1.6/lib/ant-nodeps.jar:/usr/share/ant1.6/lib/ant-launcher.jar:lib/velocity-1.4-dev.jar:lib/jdom-b9.jar:lib/jdom-b8.jar:lib/avalon-framework-4.1.4.jar:lib/avalon-excalibur-4.1.jar:lib/avalon-excalibur-4.1.jar:lib/commons-collections.jar:lib/logkit-1.2.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar:/usr/share/java/bsh.jar:/usr/share/java/bsf.jar:.
+CLASSPATH=/usr/share/java/oro.jar:/usr/share/java/xerces.jar:/usr/share/java/junit.jar:/usr/share/java/log4j.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/avalon-excalibur.jar:/usr/share/java/regexp.jar:/usr/share/ant1.6/lib/ant.jar:/usr/share/ant1.6/lib/ant-nodeps.jar:/usr/share/ant1.6/lib/ant-launcher.jar:lib/velocity-1.4-dev.jar:lib/jdom-b9.jar:lib/jdom-b8.jar:lib/avalon-framework-4.1.4.jar:lib/avalon-excalibur-4.1.jar:lib/avalon-excalibur-4.1.jar:lib/commons-collections.jar:lib/logkit-1.2.jar:/usr/share/java/gnumail.jar:/usr/share/java/activation.jar:/usr/share/java/bsh.jar:/usr/share/java/bsf.jar:.
-
-JAVA_HOME=/usr/lib/j2sdk1.4-sun
+jdk_dirs:=/usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun
/usr/lib/j2sdk1.4-blackdown /usr/lib/j2sdk1.4-ibm
+JAVA_HOME=$(shell for jdir in $(jdk_dirs); do if [ -d "$$jdir" ]; then echo
$$jdir; exit 0; fi; done)
JAVA=${JAVA_HOME}/bin/java
include debian/rules.mk
@@ -58,9 +58,9 @@
# install -m 755 debian/bin/jmeter debian/bin/jmeter-server
debian/tmp/usr/bin
install -m 755 debian/bin/jmeter debian/tmp/usr/bin
mkdir -p debian/tmp/usr/share/jmeter/printable_docs/
- cp -ar $(builddir)/docs/usermanual
debian/tmp/usr/share/jmeter/printable_docs/
+ cp -ar $(builddir)/xdocs/usermanual
debian/tmp/usr/share/jmeter/printable_docs/
- dh_installdocs -i $(builddir)/docs
+ dh_installdocs -i $(builddir)/xdocs
# Must have debmake installed for this to work. Otherwise please copy
# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
