[jakarta-jmeter] 15/60: Prepared 2.4-3 release
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 29 22:43:43 UTC 2016
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 e535874f51cf64e80a122d7f528cb1db6befd9e8
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date: Sun Apr 22 11:52:15 2012 +0000
Prepared 2.4-3 release
---
debian/changelog | 14 ++++++++++++++
debian/control | 24 ++++++++++++------------
debian/patches/02_disable_components.patch | 24 ++++++------------------
debian/rules | 3 ++-
debian/wrappers/jmeter | 7 -------
5 files changed, 34 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 27eedd1..56833d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+jakarta-jmeter (2.4-3) unstable; urgency=low
+
+ * Merge Ubuntu changes (gnumail -> geronimo-javamail).
+ * Use javahelper, *.classpath files to set classpath and runtime
+ dependencies.
+ * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion.
+ * Update 02_disable_components.patch to build SMIMEAssertion* again.
+ * Remove few unnedded/unused dependencies - batik, bsh, gnumail, jboss-j2ee.
+ * Minimize jar lookup in launcher script because classpath has been set in
+ all jar files.
+ * Bump standards version to 3.9.3. No changes needed.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 21 Apr 2012 16:17:45 +0530
+
jakarta-jmeter (2.4-2) unstable; urgency=low
* Team upload.
diff --git a/debian/control b/debian/control
index 950c6f9..5d23138 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: net
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
-Build-Depends-Indep: default-jdk, default-jdk-doc, junit4, 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-ja [...]
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>=5), cdbs, javahelper, ant, ant-optional
+Build-Depends-Indep: default-jdk, default-jdk-doc, junit4, libavalon-framework-java, libbcmail-java, libbcprov-java, libbsf-java, libcommons-collections3-java, libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), libcommons-lang-java, libcommons-net-java, libgeronimo-activation-1.1-spec-java, libgeronimo-javamail-1.4-spec-java, libgeronimo-jms-1.1-spec-java, libhtmlparser-java, libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, libexcalibur [...]
+Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/jakarta-jmeter/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jakarta-jmeter/
Homepage: http://jakarta.apache.org/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, libxmlgraphics-commons-java, libxstream-java, rhino
+Depends: ${misc:Depends}, default-jre | java2-runtime, java-wrappers (>= 0.1.14), ${java:Depends}
Recommends: jmeter-http (= ${binary:Version}), jmeter-help (= ${binary:Version})
Description: Load testing and performance measurement application (main application)
Apache JMeter is a 100% pure Java desktop application designed to load test
@@ -24,7 +24,7 @@ Description: Load testing and performance measurement application (main applicat
Package: jmeter-ftp
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-io-java, libcommons-lang-java, libcommons-net-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (ftp module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -34,7 +34,7 @@ Description: Load testing and performance measurement application (ftp module)
Package: jmeter-http
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libexcalibur-logkit-java, libhtmlparser-java, libjtidy-java, liboro-java, libxstream-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (http module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -44,7 +44,7 @@ Description: Load testing and performance measurement application (http module)
Package: jmeter-java
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libbsf-java, libcommons-io-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (java module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -54,7 +54,7 @@ Description: Load testing and performance measurement application (java module)
Package: jmeter-jms
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (jms module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -64,7 +64,7 @@ Description: Load testing and performance measurement application (jms module)
Package: jmeter-junit
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), junit4, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (junit module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -74,7 +74,7 @@ Description: Load testing and performance measurement application (junit module)
Package: jmeter-ldap
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-lang-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (ldap module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -84,7 +84,7 @@ Description: Load testing and performance measurement application (ldap module)
Package: jmeter-mail
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libgnumail-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (mail module)
Apache JMeter is a 100% pure Java desktop application designed to load test
functional behavior and measure performance. It was originally designed for
@@ -94,7 +94,7 @@ Description: Load testing and performance measurement application (mail module)
Package: jmeter-tcp
Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-io-java, libexcalibur-logkit-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends}
Description: Load testing and performance measurement application (tcp module)
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/02_disable_components.patch b/debian/patches/02_disable_components.patch
index bcdb0fe..4dc8488 100644
--- a/debian/patches/02_disable_components.patch
+++ b/debian/patches/02_disable_components.patch
@@ -2,21 +2,9 @@ Description: Disable components which fail to build because of yet unpackaged
build dependencies.
Forwarded: not-needed
Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build.xml 2011-04-16 23:48:31.000000000 +0530
-+++ b/build.xml 2011-04-17 00:23:03.000000000 +0530
-@@ -497,9 +497,10 @@
-
- <target name="compile-components" depends="compile-jorphan,compile-core" description="Compile generic (protocol-independent) components.">
- <mkdir dir="${build.components}"/>
-- <javac srcdir="${src.components}" destdir="${build.components}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
-+ <javac sourcepath="" srcdir="${src.components}" destdir="${build.components}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
- includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
- <include name="**/*.java"/>
-+ <exclude name="**/SMIMEAssertion*.java"/>
- <classpath>
- <pathelement location="${build.jorphan}"/>
- <pathelement location="${build.core}"/>
-@@ -524,9 +525,10 @@
+--- a/build.xml 2012-04-21 18:29:57.000000000 +0530
++++ b/build.xml 2012-04-21 18:52:34.000000000 +0530
+@@ -524,9 +524,10 @@
<target name="compile-http" depends="compile-jorphan,compile-core,compile-components" description="Compile components specific to HTTP sampling.">
<mkdir dir="${build.http}"/>
<!-- Directory needs to exist, or jar will fail -->
@@ -28,7 +16,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<classpath>
<pathelement location="${build.jorphan}"/>
<pathelement location="${build.core}"/>
-@@ -673,7 +675,7 @@
+@@ -673,7 +674,7 @@
</javac>
</target>
@@ -37,7 +25,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
<mkdir dir="${build.examples}"/>
-@@ -879,11 +881,11 @@
+@@ -879,11 +880,11 @@
</jar>
<!-- jdbc -->
@@ -51,7 +39,7 @@ Author: Onkar Shinde <onshinde at ubuntu.com>
<!-- java -->
<jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-@@ -1564,7 +1566,7 @@
+@@ -1564,7 +1565,7 @@
packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
excludepackagenames="org.apache.jorphan.timer">
<classpath refid="classpath"/>
diff --git a/debian/rules b/debian/rules
index 2a76507..157a473 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+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 batik bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-jms-1.1-spec gnumail jboss-j2ee jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity
+DEB_JARS := ant-nodeps avalon-framework bcmail bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang commons-net geronimo-activation-1.1-spec geronimo-jms-1.1-spec geronimo-javamail-1.4-spec geronimo-jms_1.1_spec jcharts jdom1 js jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons xstream velocity
DEB_ANT_BUILD_TARGET := install docs-printable docs-api
ANT_ARGS := -Dlib.api=/usr/share/java -Djmeter.version=$(DEB_UPSTREAM_VERSION)
diff --git a/debian/wrappers/jmeter b/debian/wrappers/jmeter
index 3f1462e..d666167 100644
--- a/debian/wrappers/jmeter
+++ b/debian/wrappers/jmeter
@@ -3,13 +3,6 @@
# Include the wrappers utility script
. /usr/lib/java-wrappers/java-wrappers.sh
-find_jars activation 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 geronimo-jms-1.1-spec gnumail
-find_jars gnumail-providers jboss-j2ee jcharts jdom1 jtidy js
-find_jars junit4 libhtmlparser oro xalan2 xmlgraphics-commons xstream
-find_jars /usr/share/jmeter/lib/jorphan.jar
find_jars /usr/share/jmeter/bin/ApacheJMeter.jar
run_java -Djmeter.home=/usr/share/jmeter org.apache.jmeter.NewDriver "$@"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git
More information about the pkg-java-commits
mailing list