[pkg-java] r16041 - in trunk/jakarta-jmeter/debian: . patches

Onkar Shinde onkarshinde-guest at alioth.debian.org
Sat May 5 10:18:33 UTC 2012 

Author: onkarshinde-guest
Date: 2012-05-05 10:18:33 +0000 (Sat, 05 May 2012)
New Revision: 16041

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/control
   trunk/jakarta-jmeter/debian/copyright
   trunk/jakarta-jmeter/debian/jmeter-http.classpath
   trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
   trunk/jakarta-jmeter/debian/rules
   trunk/jakarta-jmeter/debian/watch
Log:
Prepared jakarta-jmeter 2.5.1-1 release

Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/changelog	2012-05-05 10:18:33 UTC (rev 16041)
@@ -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 <onkarshinde at ubuntu.com>  Thu, 03 May 2012 20:19:04 +0530
+
 jakarta-jmeter (2.4-3) unstable; urgency=low
 
   * Merge Ubuntu changes (gnumail -> geronimo-javamail).

Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/control	2012-05-05 10:18:33 UTC (rev 16041)
@@ -4,11 +4,11 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 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-logger-java, liboro-java, librhino-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, velocity
+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, libexcalibur-logkit-java, libexcalibur-logger-java, liboro-java, librhino-java, libxalan2-java, libxmlgraphics-commons-java, libxstream-java, velocity
 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

Modified: trunk/jakarta-jmeter/debian/copyright
===================================================================
--- trunk/jakarta-jmeter/debian/copyright	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/copyright	2012-05-05 10:18:33 UTC (rev 16041)
@@ -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

Modified: trunk/jakarta-jmeter/debian/jmeter-http.classpath
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter-http.classpath	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/jmeter-http.classpath	2012-05-05 10:18:33 UTC (rev 16041)
@@ -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

Modified: trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/patches/02_disable_components.patch	2012-05-05 10:18:33 UTC (rev 16041)
@@ -2,21 +2,21 @@
  build dependencies.
 Forwarded: not-needed
 Author: Onkar Shinde <onshinde at ubuntu.com>
---- 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 @@
  
    <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>

Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/rules	2012-05-05 10:18:33 UTC (rev 16041)
@@ -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 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)
 

Modified: trunk/jakarta-jmeter/debian/watch
===================================================================
--- trunk/jakarta-jmeter/debian/watch	2012-05-05 04:12:34 UTC (rev 16040)
+++ trunk/jakarta-jmeter/debian/watch	2012-05-05 10:18:33 UTC (rev 16041)
@@ -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

More information about the pkg-java-commits mailing list