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 8b27a6f72d3a22b5f4300441a15bf5a2887fe315 Author: Onkar Shinde <[email protected]> Date: Sat May 5 10:18:33 2012 +0000 Prepared jakarta-jmeter 2.5.1-1 release --- debian/changelog | 12 ++++++++++++ debian/control | 4 ++-- debian/copyright | 4 ++-- debian/jmeter-http.classpath | 2 +- debian/patches/02_disable_components.patch | 23 +++++++++++++---------- debian/rules | 2 +- debian/watch | 2 +- 7 files changed, 32 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13ea021..63e8826 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +jakarta-jmeter (2.5.1-1) unstable; urgency=low + + * New upstream release. (Closes: #641546, LP: #879463) + * Change home page URL everywhere. + * Add new build dependencies libhttpclient-java, libhttpmime-java for http + module. Update build and runtime classpath accordingly. + * Refreshed 02_disable_components.patch as per latest source. + * Update 'Format' value in debian/copyright. + * Point watch file to archive area until we used renamed upstream source. + + -- Onkar Shinde <[email protected]> Thu, 03 May 2012 20:19:04 +0530 + jakarta-jmeter (2.4-3) unstable; urgency=low * Merge Ubuntu changes (gnumail -> geronimo-javamail). diff --git a/debian/control b/debian/control index 5d23138..3d95548 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Onkar Shinde <[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, 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 [...] +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, libhttpclient-java, libhttpmime-java, libjcharts-java, libjdom1-java, libjtidy-java, [...] 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/ +Homepage: http://jmeter.apache.org/ DM-Upload-Allowed: yes Package: jmeter diff --git a/debian/copyright b/debian/copyright index 43d5352..182833f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Apache JMeter -Source: http://jakarta.apache.org/jmeter/ +Source: http://jmeter.apache.org/ Files: * Copyright: 2009, The Apache Software Foundation diff --git a/debian/jmeter-http.classpath b/debian/jmeter-http.classpath index 9aa93b9..931fd20 100644 --- a/debian/jmeter-http.classpath +++ b/debian/jmeter-http.classpath @@ -1 +1 @@ -usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar +usr/share/jmeter/lib/ext/ApacheJMeter_http.jar /usr/share/java/commons-httpclient.jar /usr/share/java/commons-io.jar /usr/share/java/commons-lang.jar /usr/share/java/commons-logging.jar /usr/share/java/excalibur-logkit.jar /usr/share/java/libhtmlparser.jar /usr/share/java/httpclient.jar /usr/share/java/httpcore.jar /usr/share/java/httpmime.jar /usr/share/java/jtidy.jar /usr/share/java/oro.jar /usr/share/java/xstream.jar diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch index 4dc8488..09f299b 100644 --- a/debian/patches/02_disable_components.patch +++ b/debian/patches/02_disable_components.patch @@ -2,21 +2,21 @@ Description: Disable components which fail to build because of yet unpackaged build dependencies. Forwarded: not-needed Author: Onkar Shinde <[email protected]> ---- 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 @@ +--- a/build.xml 2012-05-01 17:37:52.000000000 +0530 ++++ b/build.xml 2012-05-01 17:39:04.000000000 +0530 +@@ -545,9 +545,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 --> -- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" -+ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" +- <javac srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" ++ <javac sourcepath="" srcdir="${src.http}" destdir="${build.http}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}" includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}"> <include name="**/*.java"/> + <exclude name="**/WebServiceSampler*.java"/> <classpath> <pathelement location="${build.jorphan}"/> <pathelement location="${build.core}"/> -@@ -673,7 +674,7 @@ +@@ -694,7 +695,7 @@ </javac> </target> @@ -25,25 +25,28 @@ Author: Onkar Shinde <[email protected]> <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components."> <mkdir dir="${build.examples}"/> -@@ -879,11 +880,11 @@ +@@ -933,14 +934,14 @@ </jar> <!-- jdbc --> - <jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> + <!--jar jarfile="${dest.jar}/ApacheJMeter_jdbc.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> + <zipfileset file="${resources.meta-inf}/default.notice" + fullpath="META-INF/NOTICE" /> + <zipfileset file="${resources.meta-inf}/default.license" + fullpath="META-INF/LICENSE" /> <fileset dir="${build.jdbc}" includes="**/*.class" /> <fileset dir="${src.jdbc}" includes="**/*.properties" /> - <metainf dir="." includes="LICENSE,NOTICE"/> - </jar> + </jar--> <!-- java --> <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF"> -@@ -1564,7 +1565,7 @@ +@@ -1690,7 +1691,7 @@ packagenames="org.apache.jmeter.*,org.apache.jorphan.*" excludepackagenames="org.apache.jorphan.timer"> <classpath refid="classpath"/> -- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/> +- <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/> + <link href="file:///usr/share/doc/default-jdk-doc/api/"/> </javadoc> </target> diff --git a/debian/rules b/debian/rules index 157a473..8cd3339 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-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_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 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) diff --git a/debian/watch b/debian/watch index 2fcd071..93811b8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz debian debian/orig-tar.sh +http://archive.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-([\d\.]+)_src\.tgz debian debian/orig-tar.sh -- 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
