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 7808bcfbeb380edbbae7830d9845b8c9f6466e7f Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 3 10:48:41 2013 +0000 Added the missing dependency on bcpkix Use canonical URLs for the Vcs-* fields --- debian/changelog | 4 ++-- debian/control | 66 +++++++++++++++++++++++++++++++++++++------------------- debian/rules | 4 ++-- 3 files changed, 48 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61e980b..6ffc267 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ jakarta-jmeter (2.5.1-2) experimental; urgency=low - * Team upload. - * Patched to compile against Bouncy Castle 1.48 + * Patched to compile against Bouncy Castle 1.48 (Closes: #713151) * debian/watch: Updated the location of the archives following the graduation of JMeter to a top level project. * Removed the DMUA flag * Bump standards version to 3.9.4. No changes needed. + * Use canonical URLs for the Vcs-* fields -- Emmanuel Bourg <[email protected]> Sat, 30 Mar 2013 23:34:00 +0100 diff --git a/debian/control b/debian/control index 375dd7f..e3af0f2 100644 --- a/debian/control +++ b/debian/control @@ -3,24 +3,46 @@ Section: net Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Onkar Shinde <[email protected]>, Emmanuel Bourg <[email protected]> -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 (>= 1.48), libbsf-java, libcommons-collections3-java, - libcommons-httpclient-java, libcommons-io-java, libcommons-jexl-java (>= 1.1), - libcommons-lang-java, libcommons-net-java, libgeronimo-javamail-1.4-spec-java, - libgeronimo-jms-1.1-spec-java, libhtmlparser-java, libhttpclient-java, libhttpmime-java, - libjcharts-java, libjdom1-java, libjtidy-java, libexcalibur-logkit-java, - libexcalibur-logger-java, liboro-java, librhino-java, libxalan2-java, - libxmlgraphics-commons-java, libxstream-java, velocity +Build-Depends: ant, ant-optional, cdbs, debhelper (>=5), javahelper +Build-Depends-Indep: default-jdk, + default-jdk-doc, + junit4, + libavalon-framework-java, + libbcmail-java, + libbcprov-java (>= 1.48), + libbcpkix-java (>= 1.48), + libbsf-java, + libcommons-collections3-java, + libcommons-httpclient-java, + libcommons-io-java, + libcommons-jexl-java (>= 1.1), + libcommons-lang-java, + 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, + libhttpmime-java, + libjcharts-java, + libjdom1-java, + libjtidy-java, + liboro-java, + librhino-java, + libxalan2-java, + libxmlgraphics-commons-java, + libxstream-java, + velocity Standards-Version: 3.9.4 -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://jmeter.apache.org/ +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jakarta-jmeter/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jakarta-jmeter/ +Homepage: http://jmeter.apache.org Package: jmeter Architecture: all -Depends: ${misc:Depends}, default-jre | java2-runtime, java-wrappers (>= 0.1.14), ${java:Depends} -Recommends: jmeter-http (= ${binary:Version}), jmeter-help (= ${binary:Version}) +Depends: default-jre | java2-runtime, java-wrappers (>= 0.1.14), ${java:Depends}, ${misc:Depends} +Recommends: jmeter-help (= ${binary:Version}), jmeter-http (= ${binary:Version}) Description: Load testing and performance measurement application (main application) Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance. It was originally designed for @@ -30,7 +52,7 @@ Description: Load testing and performance measurement application (main applicat Package: jmeter-ftp Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -40,7 +62,7 @@ Description: Load testing and performance measurement application (ftp module) Package: jmeter-http Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -50,7 +72,7 @@ Description: Load testing and performance measurement application (http module) Package: jmeter-java Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -60,7 +82,7 @@ Description: Load testing and performance measurement application (java module) Package: jmeter-jms Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -70,7 +92,7 @@ Description: Load testing and performance measurement application (jms module) Package: jmeter-junit Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -80,7 +102,7 @@ Description: Load testing and performance measurement application (junit module) Package: jmeter-ldap Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -90,7 +112,7 @@ Description: Load testing and performance measurement application (ldap module) Package: jmeter-mail Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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 @@ -100,7 +122,7 @@ Description: Load testing and performance measurement application (mail module) Package: jmeter-tcp Architecture: all -Depends: ${misc:Depends}, jmeter (= ${binary:Version}), ${java:Depends} +Depends: jmeter (= ${binary:Version}), ${java:Depends}, ${misc: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/rules b/debian/rules index 54788fc..b335c28 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ 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 bcmail bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang 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 +DEB_JARS := ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient commons-io commons-jexl commons-lang 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 DEB_ANT_BUILD_TARGET := install docs-printable docs-api ANT_ARGS := -Dlib.api=/usr/share/java -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 + uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename -- 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
