[jexcelapi] 25/27: Fixed the build failure with Java 9 (Closes: #893204)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Mar 28 12:08:11 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jexcelapi.
commit 6a2eb863b758fe291e8e03d79c49efc72d5a4fc6
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Mar 26 02:39:21 2018 +0200
Fixed the build failure with Java 9 (Closes: #893204)
---
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/source-encoding.diff | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 432c60d..97a9e4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
jexcelapi (2.6.12-3) UNRELEASED; urgency=medium
* Team upload.
+ * Fixed the build failure with Java 9 (Closes: #893204)
* Removed Damien Raude-Morvan from the uploaders (Closes: #88935)
* Build with the DH sequencer instead of CDBS
* Moved the package to Git
diff --git a/debian/patches/series b/debian/patches/series
index 9720615..d22acd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
system_jflex.diff
+source-encoding.diff
diff --git a/debian/patches/source-encoding.diff b/debian/patches/source-encoding.diff
new file mode 100644
index 0000000..bd6fb38
--- /dev/null
+++ b/debian/patches/source-encoding.diff
@@ -0,0 +1,21 @@
+Description: Set the source encoding to fix the build failures with Java 9+
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -54,6 +54,7 @@
+ <javac destdir="${outputDir}"
+ classpath=".:${loggerClasspath}"
+ srcdir="${sourceDir}"
++ encoding="ISO-8859-1"
+ debug="true"
+ deprecation="on">
+ <include name="jxl/*.java" />
+@@ -83,6 +84,7 @@
+ <mkdir dir="${docsDir}" />
+ <javadoc sourcepath="${sourceDir}"
+ destdir="${docsDir}"
++ encoding="ISO-8859-1"
+ public="true"
+ nodeprecated="false">
+ <package name="jxl" />
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jexcelapi.git
More information about the pkg-java-commits
mailing list