[jakarta-jmeter] 55/60: Release 2.11-5

[Emmanuel Bourg]

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 96d2c23e5f3a066ac828cb4a34defd6b35c6d408
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Dec 6 15:47:33 2015 +0000

    Release 2.11-5
---
 debian/changelog                          | 7 +++++++
 debian/patches/08_bouncycastle-1.51.patch | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d60b981..400ab1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jakarta-jmeter (2.11-5) unstable; urgency=medium
+
+  * Team upload.
+  * Add bouncycastle-1.51.patch and fix FTBFS with bouncycastle >= 1.51.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 06 Dec 2015 16:30:41 +0100
+
 jakarta-jmeter (2.11-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/08_bouncycastle-1.51.patch b/debian/patches/08_bouncycastle-1.51.patch
index 095469a..9bd664a 100644
--- a/debian/patches/08_bouncycastle-1.51.patch
+++ b/debian/patches/08_bouncycastle-1.51.patch
@@ -2,6 +2,10 @@ From: Markus Koschany <apo at debian.org>
 Date: Sun, 29 Nov 2015 18:42:07 +0100
 Subject: bouncycastle 1.51
 
+Fix FTBFS with bouncycastle >= 1.51. This is apparently fixed in the
+development version of jmeter. The patch can be dropped with jmeter 2.14.
+
+Forwarded: https://bz.apache.org/bugzilla/attachment.cgi?id=33178
 ---
  .../apache/jmeter/assertions/SMIMEAssertion.java   | 22 +++++++++++++---------
  .../assertions/SMIMEAssertionTestElement.java      |  5 +++++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git