[Git][java-team/libnanoxml2-java][master] 5 commits: Update changelog for 2.2.3.dfsg-6 release

[Jochen Sprickerhof]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / libnanoxml2-java


Commits:
e6626817 by Jochen Sprickerhof at 2019-04-13T19:23:04Z
Update changelog for 2.2.3.dfsg-6 release

- - - - -
6a521404 by Jochen Sprickerhof at 2019-04-13T20:27:40Z
Use long options for jh_build

This prevents jh_build from stripping the '-' in '-source' and failing
the build.

Closes: #927016

- - - - -
f55bc4ba by Jochen Sprickerhof at 2019-04-13T20:28:41Z
Disable javadoc link for JDK API and drop build-dep on default-jdk-doc

- - - - -
8e25d135 by Jochen Sprickerhof at 2019-04-13T20:30:31Z
Fix doc-base-file-references-wrong-path lintian warning

- - - - -
fa39570f by Jochen Sprickerhof at 2019-04-13T20:31:49Z
Update changelog for 2.2.3.dfsg-7 release

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/libnanoxml2-java-doc.javadoc
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,13 @@
-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 at 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 at fau.xxx>  Fri, 08 Sep 2017 13:16:03 +0100
+ -- Andreas Tille <tille at 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 at 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
=====================================
@@ -1 +1 @@
-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
 



View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/7d3418b84eef25dcddc3cd864aa8365353da5ff8...fa39570f9bf63b5e3faffead665a76ce92cf5bff

-- 
View it on GitLab: https://salsa.debian.org/java-team/libnanoxml2-java/compare/7d3418b84eef25dcddc3cd864aa8365353da5ff8...fa39570f9bf63b5e3faffead665a76ce92cf5bff
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190413/4187750c/attachment.html>