[pkg-java] r18278 - trunk/jakarta-jmeter/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-17 23:18:21 +0000 (Thu, 17 Jul 2014)
New Revision: 18278

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/rules
Log:
Do not mount /usr/share/java in the classpath to avoid build failures on non clean systems



Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2014-07-17 22:16:13 UTC (rev 18277)
+++ trunk/jakarta-jmeter/debian/changelog	2014-07-17 23:18:21 UTC (rev 18278)
@@ -9,6 +9,8 @@
   * 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
 

Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules	2014-07-17 22:16:13 UTC (rev 18277)
+++ trunk/jakarta-jmeter/debian/rules	2014-07-17 23:18:21 UTC (rev 18278)
@@ -5,9 +5,13 @@
 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