[ognl] 05/09: Add encoding.patch and fix FTBFS with Java 9.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository ognl.

commit e4f0053eb4372501c5d87f57a3a513e5cb26df56
Author: Markus Koschany <apo at debian.org>
Date:   Wed Apr 18 22:01:53 2018 +0200

    Add encoding.patch and fix FTBFS with Java 9.
---
 debian/patches/encoding.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 43 insertions(+)

diff --git a/debian/patches/encoding.patch b/debian/patches/encoding.patch
new file mode 100644
index 0000000..668b204
--- /dev/null
+++ b/debian/patches/encoding.patch
@@ -0,0 +1,42 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 18 Apr 2018 22:01:29 +0200
+Subject: encoding
+
+Fix FTBFS with Java 9.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893380
+---
+ osbuild.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/osbuild.xml b/osbuild.xml
+index b58dd81..7bddc96 100644
+--- a/osbuild.xml
++++ b/osbuild.xml
+@@ -57,7 +57,7 @@
+     <target name="compile" depends="init">
+         <mkdir dir="${build.java}"/>
+         <javac srcdir="${src.java}" destdir="${build.java}" classpathref="cp" debug="on" source="${compile.version}"
+-               target="${compile.version}"/>
++               target="${compile.version}" encoding="iso-8859-1"/>
+         <copy filtering="no" todir="${build.java}">
+             <fileset dir="${src.java}">
+                 <exclude name="**/*.java"/>
+@@ -67,7 +67,7 @@
+ 
+         <mkdir dir="${build.test}"/>
+         <javac srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}" source="${compile.version}"
+-               target="${compile.version}" classpathref="cp" debug="on"/>
++               target="${compile.version}" classpathref="cp" debug="on" encoding="iso-8859-1"/>
+         <copy filtering="no" todir="${build.test}">
+             <fileset dir="${src.test}">
+                 <exclude name="**/*.java"/>
+@@ -77,7 +77,7 @@
+ 
+         <mkdir dir="${build.java-test}"/>
+         <javac srcdir="${src.java}" destdir="${build.java-test}" source="${compile.version}" target="${compile.version}"
+-               classpathref="cp" debug="on"/>
++               classpathref="cp" debug="on" encoding="iso-8859-1"/>
+         <copy filtering="no" todir="${build.java-test}">
+             <fileset dir="${src.java}">
+                 <exclude name="**/*.java"/>
diff --git a/debian/patches/series b/debian/patches/series
index ffb230c..c1dde66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02_docbook_xml_source_compliance.diff
 01_build_xml.diff
 03_javadoc.diff
+encoding.patch

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