[libfreemarker-java] 05/06: Fix FTBFS with Java 9.
Markus Koschany
apo at moszumanska.debian.org
Sun Apr 1 15:53:04 UTC 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libfreemarker-java.
commit 2f3cf662d62132d0bbe26d33fcf65c869a3f3dad
Author: Markus Koschany <apo at debian.org>
Date: Sun Apr 1 17:48:24 2018 +0200
Fix FTBFS with Java 9.
Closes: #893288
---
debian/patches/java9.patch | 34 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 35 insertions(+)
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..1413ab3
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,34 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 1 Apr 2018 17:47:49 +0200
+Subject: java9
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893288
+Forwarded: no
+---
+ build.xml | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 86394f4..0ed2d61 100644
+--- a/build.xml
++++ b/build.xml
+@@ -181,19 +181,6 @@
+ </target>
+
+ <target name="compile" depends="javacc">
+- <fail unless="boot.classpath.j2se1.4.correct"><!--
+- -->The "boot.classpath.j2se1.4" property value (${boot.classpath.j2se1.4}) <!--
+- -->seems to be an incorrect boot classpath. Please fix it in <!--
+- -->the <projectDir>/build.properties file, or wherever you <!--
+- -->set it.<!--
+- --></fail>
+- <fail unless="boot.classpath.j2se1.5.correct"><!--
+- -->The "boot.classpath.j2se1.5" property value (${boot.classpath.j2se1.5}) <!--
+- -->seems to be an incorrect boot classpath. Please fix it in <!--
+- -->the <projectDir>/build.properties file, or wherever you <!--
+- -->set it.<!--
+- --></fail>
+- <echo level="info">Using boot classpaths: 1.4: ${boot.classpath.j2se1.4}; 1.5: ${boot.classpath.j2se1.5}</echo>
+
+ <mkdir dir="build/classes" />
+
diff --git a/debian/patches/series b/debian/patches/series
index fa10740..51789d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ ivy-configuration.patch
exclude-avalon-logger.patch
jython-compatibility.patch
fix-tests-classpath.patch
+java9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libfreemarker-java.git
More information about the pkg-java-commits
mailing list