debian/changelog

-zookeeper (3.4.12-2) UNRELEASED; urgency=medium
+zookeeper (3.4.12-2) unstable; urgency=medium
 
+  * Team upload.
+
+  [ tony mancill ]
   * Add patch for FTBFS with GCC-8 (Closes: #897892)
 
- -- tony mancill <tmancill@debian.org>  Sat, 30 Jun 2018 20:59:21 -0700
+  [ Markus Koschany ]
+  * Declare compliance with Debian Policy 4.2.0.
+  * debian/control: Remove ancient X-Python-Version field because it is
+    satisfied even in oldstable.
+  * Add 15-javadoc-doclet.patch. The missing doclet class causes a javadoc
+    error. Now the documentation is built again.
+
+ -- Markus Koschany <apo@debian.org>  Thu, 23 Aug 2018 12:16:06 +0200
 
 zookeeper (3.4.12-1) unstable; urgency=medium
 

debian/control

@@ -35,8 +35,7 @@ Build-Depends:
  pkg-config,
  procps,
  python-all-dev (>= 2.6.6-3~)
-X-Python-Version: >= 2.6
-Standards-Version: 4.1.4
+Standards-Version: 4.2.0
 Vcs-Git: https://salsa.debian.org/java-team/zookeeper.git
 Vcs-Browser: https://salsa.debian.org/java-team/zookeeper
 Homepage: https://zookeeper.apache.org

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Apache Zookeeper
 Source: http://hadoop.apache.org/zookeeper/releases.html
 

debian/patches/15-javadoc-doclet.patch

+From: Markus Koschany <apo@debian.org>
+Date: Thu, 23 Aug 2018 12:52:04 +0200
+Subject: 15 javadoc doclet
+
+The missing doclet class causes a javadoc error thus no javadoc will be built
+at all.
+
+Forwarded: not-needed
+---
+ build.xml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 9e81b99..7c1fa40 100644
+--- a/build.xml
++++ b/build.xml
+@@ -554,8 +554,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
+          bottom="Copyright &amp;copy; ${year} The Apache Software Foundation"
+          locale="en"
+          additionalparam="-notimestamp"
+-         doclet="org.apache.yetus.audience.tools.IncludePublicAnnotationsStandardDoclet"
+-         docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar"
+          >
+ 
+         <fileset dir="${java.src.dir}">

debian/patches/series

@@ -10,3 +10,4 @@
 12-add-yetus-annotations.patch
 13-disable-netty-connection-factory.patch
 14-ftbfs-with-gcc-8.patch
+15-javadoc-doclet.patch