Package: release.debian.org Severity: normal Tags: jessie User: release.debian....@packages.debian.org Usertags: pu
Hi, I'd like to fix the bug #795356 reported against JMeter. We basically forgot to install 11 XML files and a DTD in the package, this breaks the creation of test plans derived from predefined templates. This update also contains a workaround for a regression introduced in a recent security update of libxstream-java and breaking the parsing of the templates. Thank you, Emmanuel Bourg
diff -Nru jakarta-jmeter-2.11/debian/changelog jakarta-jmeter-2.11/debian/changelog --- jakarta-jmeter-2.11/debian/changelog 2014-09-18 10:34:00.000000000 +0200 +++ jakarta-jmeter-2.11/debian/changelog 2016-05-18 15:40:03.000000000 +0200 @@ -1,3 +1,11 @@ +jakarta-jmeter (2.11-2+deb8u1) jessie-proposed-updates; urgency=medium + + * Team upload. + * Install the templates (Closes: #795356) + * Fixed an error with libxstream-java >= 1.4.9 when loading the templates + + -- Emmanuel Bourg <ebo...@apache.org> Wed, 18 May 2016 15:38:59 +0200 + jakarta-jmeter (2.11-2) unstable; urgency=medium * debian/copyright: Documented the licenses of the Oxygen, Echo and Tango icon diff -Nru jakarta-jmeter-2.11/debian/jmeter.install jakarta-jmeter-2.11/debian/jmeter.install --- jakarta-jmeter-2.11/debian/jmeter.install 2014-07-18 12:02:50.000000000 +0200 +++ jakarta-jmeter-2.11/debian/jmeter.install 2016-05-18 15:34:33.000000000 +0200 @@ -1,5 +1,6 @@ bin/*.properties usr/share/jmeter/bin/ bin/ApacheJMeter.jar usr/share/jmeter/bin/ +bin/templates usr/share/jmeter/bin/ lib/*.jar usr/share/jmeter/lib/ lib/ext/ApacheJMeter_components.jar usr/share/jmeter/lib/ext/ lib/ext/ApacheJMeter_core.jar usr/share/jmeter/lib/ext/ diff -Nru jakarta-jmeter-2.11/debian/patches/10_xstream-compatibility.patch jakarta-jmeter-2.11/debian/patches/10_xstream-compatibility.patch --- jakarta-jmeter-2.11/debian/patches/10_xstream-compatibility.patch 1970-01-01 01:00:00.000000000 +0100 +++ jakarta-jmeter-2.11/debian/patches/10_xstream-compatibility.patch 2016-05-18 15:36:43.000000000 +0200 @@ -0,0 +1,13 @@ +Description: Remove the DOCTYPE to fix an error with XStream >= 1.4.9 (external entities are disabled) +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: no +--- a/bin/templates/templates.xml ++++ b/bin/templates/templates.xml +@@ -18,7 +18,6 @@ + <!-- + See the DTD for allowable elements and attributes. + --> +-<!DOCTYPE templates SYSTEM "templates.dtd"> + <templates> + <template isTestPlan="true"> + <name>Recording</name> diff -Nru jakarta-jmeter-2.11/debian/patches/series jakarta-jmeter-2.11/debian/patches/series --- jakarta-jmeter-2.11/debian/patches/series 2014-09-17 23:04:59.000000000 +0200 +++ jakarta-jmeter-2.11/debian/patches/series 2016-05-18 15:37:02.000000000 +0200 @@ -5,3 +5,4 @@ 05_ignore-jodd.patch 06_link-to-system-javadoc.patch 07_ignore-tika.patch +10_xstream-compatibility.patch
