[xml/sgml-pkgs] Bug#893129: dita-ot FTBFS with openjdk-9

[Markus Koschany]

Dear maintainer,

I've uploaded a new revision of dita-ot versioned as 1.5.3-2.1 which
addresses the build failure with Java 9. Please find attached the debdiff.

Regards,

Markus
-------------- next part --------------
diff -Nru dita-ot-1.5.3/debian/changelog dita-ot-1.5.3/debian/changelog
--- dita-ot-1.5.3/debian/changelog	2016-08-29 08:18:47.000000000 +0200
+++ dita-ot-1.5.3/debian/changelog	2018-04-14 00:56:09.000000000 +0200
@@ -1,3 +1,10 @@
+dita-ot (1.5.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add encoding.patch and fix FTBFS with Java 9. (Closes: #893129)
+
+ -- Markus Koschany <apo at debian.org>  Sat, 14 Apr 2018 00:56:09 +0200
+
 dita-ot (1.5.3-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru dita-ot-1.5.3/debian/patches/encoding.patch dita-ot-1.5.3/debian/patches/encoding.patch
--- dita-ot-1.5.3/debian/patches/encoding.patch	1970-01-01 01:00:00.000000000 +0100
+++ dita-ot-1.5.3/debian/patches/encoding.patch	2018-04-14 00:56:09.000000000 +0200
@@ -0,0 +1,54 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 14 Apr 2018 00:55:08 +0200
+Subject: encoding
+
+Fix FTBFS with Java 9 by specifying the encoding.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893129
+---
+ buildPackage.xml         | 4 ++--
+ demo/fo/buildPackage.xml | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/buildPackage.xml b/buildPackage.xml
+index 697ac21..969f94f 100644
+--- a/buildPackage.xml
++++ b/buildPackage.xml
+@@ -72,7 +72,7 @@
+       value="${version}"/>
+     <javac srcdir="${build.dir}" destdir="${bin.dir}"
+       excludes="com/**,org/dita/dost/junit/**, org/dita/dost/invoker/JavaInvoker.java" debug="on"
+-      source="1.5" target="1.5">
++      source="1.5" target="1.5" encoding="iso-8859-1">
+       <classpath>
+         <pathelement location="${lib.dir}/resolver.jar"/>
+         <pathelement location="${lib.dir}/commons-codec-1.4.jar"/>
+@@ -547,4 +547,4 @@
+     </copy>
+   </target>
+ 
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/demo/fo/buildPackage.xml b/demo/fo/buildPackage.xml
+index d55da00..3102218 100644
+--- a/demo/fo/buildPackage.xml
++++ b/demo/fo/buildPackage.xml
+@@ -48,7 +48,7 @@
+   <target name="build-java" depends="init-java, check-icu4j, build-xep-java">
+     <javac srcdir="${src.dir}" destdir="${bin.dir}"
+       debug="on" excludes="com/idiominc/ws/opentopic/fo/xep/**"
+-      source="1.5" target="1.5">
++      source="1.5" target="1.5" encoding="iso-8859-1">
+       <classpath refid="build.class.path"/>
+     </javac>
+   </target>
+@@ -57,7 +57,7 @@
+     <javac srcdir="${src.dir}/com/idiominc/ws/opentopic/fo/xep/"
+            destdir="${bin.dir}"
+            source="1.5" target="1.5"
+-      debug="on">
++      debug="on" encoding="iso-8859-1">
+       <classpath refid="build.class.path"/>
+     </javac>
+   </target>
diff -Nru dita-ot-1.5.3/debian/patches/series dita-ot-1.5.3/debian/patches/series
--- dita-ot-1.5.3/debian/patches/series	2012-05-03 10:58:33.000000000 +0200
+++ dita-ot-1.5.3/debian/patches/series	2018-04-14 00:56:09.000000000 +0200
@@ -1,3 +1,4 @@
 debian-custom-build.patch
 same-loader-for-tasks.patch
 distribution-saxon-compat.patch
+encoding.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: OpenPGP digital signature
URL: <http://alioth-lists.debian.net/pipermail/debian-xml-sgml-pkgs/attachments/20180414/d401ff3f/attachment-0001.sig>