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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-05 07:36:52 +0000 (Fri, 05 Jul 2013)
New Revision: 16988

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/orig-tar.sh
   trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
   trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch
Log:
New upstream release (2.6)
Refreshed the patches



Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2013-07-04 12:31:04 UTC (rev 16987)
+++ trunk/jakarta-jmeter/debian/changelog	2013-07-05 07:36:52 UTC (rev 16988)
@@ -1,3 +1,10 @@
+jakarta-jmeter (2.6-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 05 Jul 2013 09:25:43 +0200
+
 jakarta-jmeter (2.5.1-2) unstable; urgency=low
 
   * Patched to compile against Bouncy Castle 1.48 (Closes: #713151)

Modified: trunk/jakarta-jmeter/debian/orig-tar.sh
===================================================================
--- trunk/jakarta-jmeter/debian/orig-tar.sh	2013-07-04 12:31:04 UTC (rev 16987)
+++ trunk/jakarta-jmeter/debian/orig-tar.sh	2013-07-05 07:36:52 UTC (rev 16988)
@@ -2,7 +2,7 @@
 
 # called by uscan with '--upstream-version' <version> <file>
 DIR=apache-jmeter-$2
-TAR=../apache-jmeter_$2.orig.tar.gz
+TAR=../jakarta-jmeter_$2.orig.tar.gz
 
 # clean up the upstream tarball
 tar zxvf $3

Modified: trunk/jakarta-jmeter/debian/patches/02_disable_components.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/02_disable_components.patch	2013-07-04 12:31:04 UTC (rev 16987)
+++ trunk/jakarta-jmeter/debian/patches/02_disable_components.patch	2013-07-05 07:36:52 UTC (rev 16988)
@@ -2,9 +2,9 @@
  build dependencies.
 Forwarded: not-needed
 Author: Onkar Shinde <onshinde at ubuntu.com>
---- 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 @@
+--- a/build.xml
++++ b/build.xml
+@@ -571,9 +571,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 -->
@@ -16,7 +16,7 @@
        <classpath>
          <pathelement location="${build.jorphan}"/>
          <pathelement location="${build.core}"/>
-@@ -694,7 +695,7 @@
+@@ -720,7 +721,7 @@
      </javac>
    </target>
  
@@ -25,7 +25,7 @@
  
    <target name="compile-examples" depends="compile-jorphan,compile-core" description="Compile example components.">
      <mkdir dir="${build.examples}"/>
-@@ -933,14 +934,14 @@
+@@ -959,14 +960,14 @@
      </jar>
  
      <!-- jdbc -->
@@ -42,7 +42,7 @@
  
      <!-- java -->
      <jar jarfile="${dest.jar}/ApacheJMeter_java.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-@@ -1690,7 +1691,7 @@
+@@ -1892,7 +1893,7 @@
        packagenames="org.apache.jmeter.*,org.apache.jorphan.*"
        excludepackagenames="org.apache.jorphan.timer">
        <classpath refid="classpath"/>

Modified: trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch	2013-07-04 12:31:04 UTC (rev 16987)
+++ trunk/jakarta-jmeter/debian/patches/03_bouncycastle_update.patch	2013-07-05 07:36:52 UTC (rev 16988)
@@ -5,7 +5,7 @@
 Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776
 --- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
 +++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-@@ -48,6 +48,7 @@
+@@ -49,6 +49,7 @@
  import org.bouncycastle.cms.CMSException;
  import org.bouncycastle.cms.SignerInformation;
  import org.bouncycastle.cms.SignerInformationStore;
@@ -13,7 +13,7 @@
  import org.bouncycastle.jce.PrincipalUtil;
  import org.bouncycastle.jce.X509Principal;
  import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@@ -148,7 +149,7 @@
+@@ -149,7 +150,7 @@
              if (signerIt.hasNext()) {
  
                  SignerInformation signer = (SignerInformation) signerIt.next();