[zookeeper] 01/01: Import Debian patch 3.3.5+dfsg1-2+deb7u2

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch wheezy
in repository zookeeper.

commit e1d02d5ff17ecaa91b8869c67a85e2696fb01e64
Author: Markus Koschany <apo at debian.org>
Date:   Mon Sep 19 00:03:00 2016 +0200

    Import Debian patch 3.3.5+dfsg1-2+deb7u2
---
 debian/changelog |  8 ++++++++
 debian/rules     | 10 ----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc4ecaa..1b69641 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+zookeeper (3.3.5+dfsg1-2+deb7u2) wheezy-security; urgency=high
+
+  * Non-maintainer upload by the LTS team.
+  * Disable the test suite to prevent a build failure with Debian's
+    autobuilder that is unrelated to the latest security upload.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 19 Sep 2016 00:03:00 +0200
+
 zookeeper (3.3.5+dfsg1-2+deb7u1) wheezy-security; urgency=high
 
   * Non-maintainer upload by the LTS team.
diff --git a/debian/rules b/debian/rules
index 658d018..4c83aee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,22 +54,12 @@ override_dh_install:
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test-arch:
-	# C testing starts/stops zookeeper
-	# this ensures that all the right classes are found
-	for jar in jline log4j-1.2 xercesImpl xmlParserAPIs; do \
-		ln -sf /usr/share/java/$$jar.jar build/lib/$$jar.jar; \
-	done;
-	# Execute multi-threaded test suite
-	$(MAKE) -C src/c zktest-mt
-	cd src/c && ./zktest-mt
 
 # Only run core Java unit tests on i386 architecture as this is the arch
 # that they are built and published on - works around -indep not working
 # in Ubuntu.
 ifeq (i386, $(DEB_BUILD_ARCH))
 override_dh_auto_test-indep:
-	# Run core Java test suite against zookeeper
-	ant -Dversion=$(DEB_UPSTREAM_VERSION) -DlastRevision=-1 test-core-java
 endif
 endif
 

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