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 8295fb657cfe2a0dd23424da7b9452d1a2a25d26 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 16 10:07:12 2015 +0000 Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/jmeter-mail.classpath | 2 +- debian/jmeter.classpath | 2 +- debian/rules | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e73b312..0e4cee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jakarta-jmeter (2.11-3) UNRELEASED; urgency=medium + + * Team upload. + * Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java + + -- Emmanuel Bourg <[email protected]> Thu, 16 Jul 2015 12:02:40 +0200 + jakarta-jmeter (2.11-2) unstable; urgency=medium * debian/copyright: Documented the licenses of the Oxygen, Echo and Tango icon diff --git a/debian/control b/debian/control index 39af759..75609e1 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Build-Depends-Indep: default-jdk, libcommons-net-java, libexcalibur-logger-java, libexcalibur-logkit-java, - libgeronimo-javamail-1.4-spec-java, libgeronimo-jms-1.1-spec-java, libhtmlparser-java, libhttpclient-java, @@ -31,6 +30,7 @@ Build-Depends-Indep: default-jdk, libjdom1-java, libjsoup-java, libjtidy-java, + libmail-java, libmongodb-java, liboro-java, librhino-java, diff --git a/debian/jmeter-mail.classpath b/debian/jmeter-mail.classpath index bb86d43..e9ed8c6 100644 --- a/debian/jmeter-mail.classpath +++ b/debian/jmeter-mail.classpath @@ -1 +1 @@ -usr/share/jmeter/lib/ext/ApacheJMeter_mail.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-activation_1.1_spec.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/geronimo-javamail-1.4-provider.jar +usr/share/jmeter/lib/ext/ApacheJMeter_mail.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/javax.mail.jar diff --git a/debian/jmeter.classpath b/debian/jmeter.classpath index 64ac841..bfa4f36 100644 --- a/debian/jmeter.classpath +++ b/debian/jmeter.classpath @@ -1,5 +1,5 @@ usr/share/jmeter/lib/jorphan.jar /usr/share/java/avalon-framework.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logger.jar /usr/share/java/excalibur-logkit.jar -usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/geronimo-javamail-1.4-spec.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar +usr/share/jmeter/lib/ext/ApacheJMeter_components.jar /usr/share/java/bcmail.jar /usr/share/java/bcprov.jar /usr/share/java/bsf.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/javax.mail.jar /usr/share/java/jcharts.jar /usr/share/java/jdom1.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar usr/share/jmeter/lib/ext/ApacheJMeter_core.jar /usr/share/java/bsf.jar /usr/share/java/commons-collections3.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xmlgraphics-commons.jar /usr/share/java/xstream.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/tika-core.jar /usr/share/java/tika-parsers.jar /usr/share/java/rsyntaxtext [...] usr/share/jmeter/lib/ext/ApacheJMeter_functions.jar /usr/share/java/commons-io.jar /usr/share/java/commons-jexl.jar /usr/share/java/commons-jexl2.jar /usr/share/java/commons-lang3.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar /usr/share/java/js.jar /usr/share/java/oro.jar /usr/share/java/xalan2.jar usr/share/jmeter/lib/ext/ApacheJMeter_monitors.jar /usr/share/java/excalibur-logkit.jar /usr/share/jmeter/lib/jorphan.jar diff --git a/debian/rules b/debian/rules index eefee09..5af758e 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ 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 \ + javax.mail 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
