[easyconf] 26/28: Fixed the build failure with Java 9 (Closes: #893143)

[Emmanuel Bourg]

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

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

commit 4010904deb4748d81df544a9a4a8950ee5899861
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 18 23:37:32 2018 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 46f077e..bc0173e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 easyconf (0.9.5-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893143)
   * Moved the package to Git
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/patches/java9-compatibility.patch b/debian/patches/java9-compatibility.patch
new file mode 100644
index 0000000..dfc9a3c
--- /dev/null
+++ b/debian/patches/java9-compatibility.patch
@@ -0,0 +1,23 @@
+Description: Fixes the build failure with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build.xml
++++ b/build.xml
+@@ -33,7 +33,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html,**/struts/**">
++    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html,**/struts/**" encoding="ISO-8859-1">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -153,7 +153,7 @@
+     </property>
+     <property name="title" value="Easyconf library 0.9.5 API">
+     </property>
+-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.germinus.easyconf.*">
++    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.germinus.easyconf.*" encoding="ISO-8859-1">
+       <classpath>
+         <fileset dir="${libdir}">
+           <include name="*.jar">
diff --git a/debian/patches/series b/debian/patches/series
index 8eadb2a..ad73d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_test.diff
 disable-struts-support.diff
+java9-compatibility.patch

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