Author: onkarshinde-guest Date: 2009-10-07 13:55:38 +0000 (Wed, 07 Oct 2009) New Revision: 10778
Modified: trunk/jakarta-jmeter/debian/changelog trunk/jakarta-jmeter/debian/control trunk/jakarta-jmeter/debian/patches/series trunk/jakarta-jmeter/debian/rules trunk/jakarta-jmeter/debian/wrappers/jmeter Log: jakarta-jmeter bug fixes Modified: trunk/jakarta-jmeter/debian/changelog =================================================================== --- trunk/jakarta-jmeter/debian/changelog 2009-10-06 08:13:41 UTC (rev 10777) +++ trunk/jakarta-jmeter/debian/changelog 2009-10-07 13:55:38 UTC (rev 10778) @@ -1,3 +1,25 @@ +jakarta-jmeter (2.3.4-2) unstable; urgency=low + + * debian/control + - Remove libgeronimo-jms-1.1-spec-java from build dependencies. + The package does not exist in Debian archive. + - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport + of the package to Lenny. + - Add libxmlgraphics-commons-java dependency. + - Add appropriate dependency to jmeter-jms package. + * debian/rules + - Add xmlgraphics-commons, js to DEB_JARS. + * debian/patches/series + - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with + use of libxmlgraphics-commons-java build-dep. + * debian/wrappers/jmeter + - Add xmlgraphics-commons to classpath. + - Add libraries needed by jmeter-jms to classpath. + * Thanks to Jam Wagner for spotting most of the problems when doing backport + to Lenny. + + -- Onkar Shinde <[email protected]> Wed, 07 Oct 2009 14:17:01 +0530 + jakarta-jmeter (2.3.4-1) unstable; urgency=low * Initial version: Merge from Ubuntu. (Closes: #505877) Modified: trunk/jakarta-jmeter/debian/control =================================================================== --- trunk/jakarta-jmeter/debian/control 2009-10-06 08:13:41 UTC (rev 10777) +++ trunk/jakarta-jmeter/debian/control 2009-10-07 13:55:38 UTC (rev 10778) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Onkar Shinde <[email protected]> Build-Depends: debhelper (>=5), cdbs, ant, ant-optional, quilt -Build-Depends-Indep: default-jdk, junit, libbatik-java, libbsf-java, libavalon-framework-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libgnumail-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, libxalan2-java, libxstream-java, velocity +Build-Depends-Indep: default-jdk, junit, libbatik-java, libbsf-java, libavalon-framework-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libjboss-j2ee-java, libgnumail-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, rhino, velocity Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jakarta-jmeter/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jakarta-jmeter/ @@ -13,7 +13,7 @@ Package: jmeter Architecture: all -Depends: ${misc:Depends}, default-jre | java2-runtime, java-wrappers (>= 0.1.14), bsh, libavalon-framework-java, libbatik-java, libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libexcalibur-logger-java, libexcalibur-logkit-java, libgnumail-java, libjcharts-java, libjtidy-java, liboro-java, libxalan2-java, libxstream-java, rhino +Depends: ${misc:Depends}, default-jre | java2-runtime, java-wrappers (>= 0.1.14), bsh, libavalon-framework-java, libbatik-java, libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libexcalibur-logger-java, libexcalibur-logkit-java, libgnumail-java, libjcharts-java, libjtidy-java, liboro-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, rhino Recommends: jmeter-http (= ${binary:Version}), jmeter-help (= ${binary:Version}) Description: Load testing and performance measurement application Apache JMeter is a 100% pure Java desktop application designed to load test @@ -54,7 +54,7 @@ Package: jmeter-jms Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgeronimo-jms-1.1-spec-java, libexcalibur-logkit-java +Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libexcalibur-logkit-java Description: Load testing and performance measurement application Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance. It was originally designed for Modified: trunk/jakarta-jmeter/debian/patches/series =================================================================== --- trunk/jakarta-jmeter/debian/patches/series 2009-10-06 08:13:41 UTC (rev 10777) +++ trunk/jakarta-jmeter/debian/patches/series 2009-10-07 13:55:38 UTC (rev 10778) @@ -1,4 +1,3 @@ -01_fix_batik_imports.patch 02_disable_components.patch 03_fix_jtidy_call.patch 04_files_from_upstream.patch Modified: trunk/jakarta-jmeter/debian/rules =================================================================== --- trunk/jakarta-jmeter/debian/rules 2009-10-06 08:13:41 UTC (rev 10777) +++ trunk/jakarta-jmeter/debian/rules 2009-10-07 13:55:38 UTC (rev 10778) @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME_DIRS := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps avalon-framework batik bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-jms-1.1-spec gnumail jboss-j2ee jcharts jdom0 jdom1 jtidy junit libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xstream velocity +DEB_JARS := ant-nodeps avalon-framework batik bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-jms-1.1-spec gnumail jboss-j2ee jcharts jdom0 jdom1 js jtidy junit libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity DEB_ANT_BUILD_TARGET := install docs-printable docs-api ANT_OPTS := -Djmeter.version=$(DEB_UPSTREAM_VERSION) @@ -15,4 +15,4 @@ install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin get-orig-source: - uscan --force-download --rename \ No newline at end of file + uscan --force-download --rename Modified: trunk/jakarta-jmeter/debian/wrappers/jmeter =================================================================== --- trunk/jakarta-jmeter/debian/wrappers/jmeter 2009-10-06 08:13:41 UTC (rev 10777) +++ trunk/jakarta-jmeter/debian/wrappers/jmeter 2009-10-07 13:55:38 UTC (rev 10778) @@ -6,8 +6,9 @@ find_jars avalon-framework batik bsf bsh commons-collections3 find_jars commons-httpclient commons-io commons-jexl commons-lang find_jars commons-logging commons-net -find_jars excalibur-logger excalibur-logkit gnumail jcharts jdom1 jtidy js -find_jars junit libhtmlparser oro xalan2 xstream +find_jars excalibur-logger excalibur-logkit geronimo-jms-1.1-spec gnumail +find_jars jboss-j2ee jcharts jdom1 jtidy js +find_jars junit libhtmlparser oro xalan2 xmlgraphics-commons xstream find_jars /usr/share/jmeter/lib/jorphan.jar find_jars /usr/share/jmeter/bin/ApacheJMeter.jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
