build.xml | 2 1 + 1 - 0 !
src/core/org/apache/jmeter/JMeter.java | 13 7 + 6 - 0 !
src/core/org/apache/jmeter/examples.txt | 19 19 + 0 - 0 !
3 files changed, 27 insertions(+), 7 deletions(-)

 improves the help displayed on the command line

build.xml | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 disable the soap sampler since it relies on the old apache soap api
 which isn't packaged yet. This library is archived here:
 http://archive.apache.org/dist/ws/soap/version-2.3.1/

build.xml | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 disable the jdbc components since it relies on the excalibur-datasource library
 which is not packaged yet

src/components/org/apache/jmeter/extractor/HtmlExtractor.java | 6 3 + 3 - 0 !
src/components/org/apache/jmeter/extractor/JoddExtractor.java | 102 0 + 102 - 0 !
src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java | 242 0 + 242 - 0 !
3 files changed, 3 insertions(+), 347 deletions(-)

 disable the joddextractor since jodd isn't in debian yet

build.xml | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 link the api documentation with the system javadoc provided by the default-jdk-doc package

src/core/org/apache/jmeter/util/Document.java | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 disable the code using apache tika until it's in debian

src/components/org/apache/jmeter/assertions/SMIMEAssertion.java | 22 13 + 9 - 0 !
src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java | 5 5 + 0 - 0 !
2 files changed, 18 insertions(+), 9 deletions(-)

 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.

src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java | 15 15 + 0 - 0 !
1 file changed, 15 insertions(+)

 fix the compatibility with httpcomponents-client >= 4.3

bin/templates/templates.xml | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 remove the doctype to fix an error with xstream >= 1.4.9 (external entities are disabled)