[stylebook] 32/34: Fixed the build failure with Java 9 (Closes: #893419)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository stylebook.

commit f6948f5b8253b35d5863ab189e7bc6633144b6e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 29 11:48:06 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893419)
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 +
 debian/patches/source-encoding.patch | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fcbc004..dcfff6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 stylebook (1.0~b3~svn20061109-7) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893419)
   * Removed Michael Koch from the uploaders (Closes: #654133)
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
diff --git a/debian/patches/series b/debian/patches/series
index 7bfeeac..a64a906 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 imageio.diff
+source-encoding.patch
diff --git a/debian/patches/source-encoding.patch b/debian/patches/source-encoding.patch
new file mode 100644
index 0000000..a46e050
--- /dev/null
+++ b/debian/patches/source-encoding.patch
@@ -0,0 +1,23 @@
+Description: Set the source encoding to fix the build failures with recent JDKs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -71,7 +71,7 @@
+        If compiling version to run with Xalan-J 2, must not include XalanProcessor in the compile. -->
+   
+   <target name="compile" depends="prepare">
+-    <javac srcdir="${build.src}" excludes="org/apache/stylebook/processors/Xalan2Processor.java" destdir="${build.dest}" classpath="${classpath}" debug="${debug}"/>
++    <javac srcdir="${build.src}" excludes="org/apache/stylebook/processors/Xalan2Processor.java" destdir="${build.dest}" classpath="${classpath}" debug="${debug}" encoding="ISO-8859-1"/>
+     <copy todir="${build.dest}/org/apache/stylebook/data">
+       <fileset dir="${build.src}/org/apache/stylebook/data"/>
+     </copy>
+@@ -83,7 +83,7 @@
+   
+ <!--Compile and Package to work with Xalan-J 2 -->
+   <target name="compile2" depends="prepare">
+-    <javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}">
++    <javac srcdir="${src.dir}" excludes="org/apache/stylebook/processors/XalanProcessor.java" destdir="${build.dest}" debug="${debug}" encoding="ISO-8859-1">
+         <exclude name="**/org/apache/stylebook/processors/XalanProcessor.java"/>
+     </javac>
+     <copy todir="${build.dest}/org/apache/stylebook/data">

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