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 da77c38f1b9ddbb3b0cc8808320bae6015c45fa3 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 5 07:36:52 2013 +0000 New upstream release (2.6) Refreshed the patches --- debian/changelog | 7 +++++++ debian/orig-tar.sh | 2 +- debian/patches/02_disable_components.patch | 12 ++++++------ debian/patches/03_bouncycastle_update.patch | 4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 361a1ce..da97e6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +jakarta-jmeter (2.6-1) UNRELEASED; urgency=low + + * New upstream release + * Refreshed the patches + + -- Emmanuel Bourg <[email protected]> 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) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 0c9e98e..08c12f6 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -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 diff --git a/debian/patches/02_disable_components.patch b/debian/patches/02_disable_components.patch index 09f299b..89c38be 100644 --- a/debian/patches/02_disable_components.patch +++ b/debian/patches/02_disable_components.patch @@ -2,9 +2,9 @@ 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-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 @@ Author: Onkar Shinde <[email protected]> <classpath> <pathelement location="${build.jorphan}"/> <pathelement location="${build.core}"/> -@@ -694,7 +695,7 @@ +@@ -720,7 +721,7 @@ </javac> </target> @@ -25,7 +25,7 @@ Author: Onkar Shinde <[email protected]> <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 @@ Author: Onkar Shinde <[email protected]> <!-- 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"/> diff --git a/debian/patches/03_bouncycastle_update.patch b/debian/patches/03_bouncycastle_update.patch index a118908..70e5f3f 100644 --- a/debian/patches/03_bouncycastle_update.patch +++ b/debian/patches/03_bouncycastle_update.patch @@ -5,7 +5,7 @@ Forwarded: yes 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 @@ Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54776 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(); -- 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
