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

[Markus Koschany]

Author: apo-guest
Date: 2015-12-06 15:47:33 +0000 (Sun, 06 Dec 2015)
New Revision: 18922

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch
Log:
Release 2.11-5


Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2015-11-30 20:48:06 UTC (rev 18921)
+++ trunk/jakarta-jmeter/debian/changelog	2015-12-06 15:47:33 UTC (rev 18922)
@@ -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.

Modified: trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch	2015-11-30 20:48:06 UTC (rev 18921)
+++ trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch	2015-12-06 15:47:33 UTC (rev 18922)
@@ -2,6 +2,10 @@
 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 +++++