[libsaxon-java] 01/01: fix build with java 9; actual non-utf-8 text :o

[Chris West]

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

faux-guest pushed a commit to branch master
in repository libsaxon-java.

commit 1d85c25440dd5f6f31fb98a06aa8c1b0c048cc79
Author: Chris West (Faux) <git at goeswhere.com>
Date:   Fri Sep 8 14:36:29 2017 +0100

    fix build with java 9; actual non-utf-8 text :o
---
 debian/changelog | 6 ++++++
 debian/rules     | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b691f4..255f58e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsaxon-java (1:6.5.5-1) UNRELEASED; urgency=medium
+
+  * Fix build with Java 9: -source, -encoding, javadoc -classpath
+
+ -- Chris West (Faux) <debian at fau.xxx>  Fri, 08 Sep 2017 14:35:48 +0100
+
 libsaxon-java (1:6.5.5-11) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index d97c59c..0e16446 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 UPSTREAM_VERSION=6.5.5
-JAVA_HOME=/usr/lib/jvm/default-java
 SOURCES=src
 BUILD=build
 APIDOC=build/api
@@ -14,7 +13,9 @@ JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1
 
 override_dh_auto_build:
 	mkdir -p $(BUILD) $(APIDOC)
-	$(JAVA_HOME)/bin/javac -nowarn -source 1.5 -target 1.5 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
+	$(JAVA_HOME)/bin/javac -nowarn -source 1.8 -target 1.8 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) \
+		-encoding ISO-8859-1 \
+		`find $(SOURCES) -name \*.java`
 	cp -r $(SOURCES)/META-INF $(BUILD)
 	cp debian/MANIFEST.MF $(BUILD)/META-INF
 	# split off jdom classes, everything else into saxon.jar
@@ -23,6 +24,7 @@ override_dh_auto_build:
 
 	# build the javadoc
 	(cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \
+		-classpath $(CLASSPATH) \
 		-link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args )
 
 debian/saxon-xslt.1: debian/saxon-xslt.1.in

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