[jakarta-jmeter] 45/60: Do not mount /usr/share/java in the classpath to avoid build failures on non clean systems

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.

commit 8d42eb598f11be8778d7db892af0937c9f200fdb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 17 23:18:21 2014 +0000

    Do not mount /usr/share/java in the classpath to avoid build failures on non clean systems
---
 debian/changelog | 2 ++
 debian/rules     | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2de20f..6e0d5c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ jakarta-jmeter (2.11-1) UNRELEASED; urgency=medium
   * Added keywords to the desktop shortcut
   * Split 02_disable_components.patch into 3 patches
   * Use XZ compression for the upstream tarball
+  * debian/rules: Do not mount /usr/share/java in the classpath to avoid build
+    failures on non clean systems
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 17 Jul 2014 13:02:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 5109782..eefee09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,13 @@ include /usr/share/cdbs/1/class/javahelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
-DEB_JARS		:= ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity tika-core tika-parsers rsyntaxtextarea
+DEB_JARS		:= ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient \
+                           commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec \
+                           geronimo-javamail-1.4-spec geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js \
+                           jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons \
+                           xstream velocity tika-core tika-parsers rsyntaxtextarea jsoup mongo-java-driver
 DEB_ANT_BUILD_TARGET	:= install docs-printable docs-api
-ANT_ARGS		:= -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
+ANT_ARGS		:= -Dlib.api=lib/opt -DincludeAntRuntime=true -Djmeter.version=$(DEB_UPSTREAM_VERSION)
 
 install/jmeter::
 	mkdir -p debian/jmeter/usr/share/jmeter/bin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git