[jakarta-jmeter] 08/60: jakarta-jmeter bug fixes

[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 761beef987d1007f0e2a35957df88da2911c2c64
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date:   Wed Oct 7 13:55:38 2009 +0000

    jakarta-jmeter bug fixes
---
 debian/changelog       | 22 ++++++++++++++++++++++
 debian/control         |  6 +++---
 debian/patches/series  |  1 -
 debian/rules           |  4 ++--
 debian/wrappers/jmeter |  5 +++--
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93dd9b4..204fca8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <onkarshinde at ubuntu.com>  Wed, 07 Oct 2009 14:17:01 +0530
+
 jakarta-jmeter (2.3.4-1) unstable; urgency=low
 
   * Initial version: Merge from Ubuntu. (Closes: #505877)
diff --git a/debian/control b/debian/control
index 5bf7ac1..4ad4cec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 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 @@ DM-Upload-Allowed: yes
 
 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 @@ Description: Load testing and performance measurement application
 
 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
diff --git a/debian/patches/series b/debian/patches/series
index 2688c7c..8139f0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_fix_batik_imports.patch
 02_disable_components.patch
 03_fix_jtidy_call.patch
 04_files_from_upstream.patch
diff --git a/debian/rules b/debian/rules
index fcdd7dc..a1c8d11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 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/jmeter::
 	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
diff --git a/debian/wrappers/jmeter b/debian/wrappers/jmeter
index 369b743..d542f5d 100644
--- a/debian/wrappers/jmeter
+++ b/debian/wrappers/jmeter
@@ -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
 

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