debian/changelog

-libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
+libnanoxml2-java (2.2.3.dfsg-7) unstable; urgency=medium
+
+  * Team upload.
+  * Use long options for jh_build (Closes: #927016)
+  * Disable javadoc link for JDK API and drop build-dep on default-jdk-doc
+  * Fix doc-base-file-references-wrong-path lintian warning
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Sat, 13 Apr 2019 22:31:41 +0200
+
+libnanoxml2-java (2.2.3.dfsg-6) unstable; urgency=medium
 
   * Team upload
 
@@ -16,7 +25,7 @@ libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium
   [ Emmanuel Bourg ]
   * Fixed the test cases
 
- -- Chris West (Faux) <debian@fau.xxx>  Fri, 08 Sep 2017 13:16:03 +0100
+ -- Andreas Tille <tille@debian.org>  Wed, 16 May 2018 13:23:44 +0200
 
 libnanoxml2-java (2.2.3.dfsg-5) unstable; urgency=medium
 

debian/control

@@ -4,8 +4,7 @@ Uploaders: Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net>
 Section: java
 Priority: optional
 Build-Depends: debhelper (>= 11~)
-Build-Depends-Indep: default-jdk-doc,
-                     default-jdk,
+Build-Depends-Indep: default-jdk,
                      bnd (>= 2.1.0),
                      perl,
                      javahelper

debian/libnanoxml2-java-doc.javadoc

-api /usr/share/doc/libnanoxml2-java/api
+api usr/share/doc/libnanoxml2-java/api

debian/rules

@@ -20,9 +20,9 @@ SAX := nanoxml-sax.jar
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	jh_build -o'${JFLAGS}' -N ${LITE} Sources/Lite/
-	jh_build -o'${JFLAGS}' -N ${NANOXML} Sources/Java/
-	CLASSPATH=${NANOXML} jh_build -o'${JFLAGS}' -N ${SAX} Sources/SAX/
+	jh_build --javacopts='${JFLAGS}' --no-javadoc ${LITE} Sources/Lite/
+	jh_build --javacopts='${JFLAGS}' --no-javadoc ${NANOXML} Sources/Java/
+	CLASSPATH=${NANOXML} jh_build --javacopts='${JFLAGS}' --no-javadoc ${SAX} Sources/SAX/
 	jh_manifest -c /usr/share/java/${NANOXML} ${SAX}
 
 	bnd wrap --output $(NANOXML).tmp $(NANOXML)
@@ -32,7 +32,7 @@ override_dh_auto_build:
 	mv $(LITE).tmp $(LITE)
 	mv $(SAX).tmp $(SAX)
 
-	${JAVA_HOME}/bin/javadoc -author -link /usr/share/doc/default-jdk-doc/api -quiet \
+	${JAVA_HOME}/bin/javadoc -author -quiet \
 	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.8 \
 	nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api