[icu4j-4.4] 05/06: Fixed the build failure with Java 9 (Closes: #875408)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 8 15:54:52 GMT 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository icu4j-4.4.
commit 170b079a5cd41cb30a0f7b7c3ddc0c2b4f8012fa
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Mar 8 16:49:03 2018 +0100
Fixed the build failure with Java 9 (Closes: #875408)
---
debian/changelog | 1 +
debian/patches/01-java8-compatibility.patch | 21 +++++++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0ad4286..5341ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
icu4j-4.4 (4.4.2.2-3) UNRELEASED; urgency=medium
* Team upload.
+ * Fixed the build failure with Java 9 (Closes: #875408)
* Removed Niels Thykier from the uploaders (Closes: #770577)
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch
index d8c6191..2b434b7 100644
--- a/debian/patches/01-java8-compatibility.patch
+++ b/debian/patches/01-java8-compatibility.patch
@@ -5,15 +5,20 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -27,6 +27,8 @@
- <or>
- <contains string="${java.version}" substring="1.6."/>
- <contains string="${java.version}" substring="1.7."/>
-+ <contains string="${java.version}" substring="1.8."/>
-+ <contains string="${java.version}" substring="1.9."/>
- </or>
- </condition>
+@@ -23,12 +23,7 @@
+ <property environment="env"/>
+
+ <!-- Java version check -->
+- <condition property="is.java6.plus">
+- <or>
+- <contains string="${java.version}" substring="1.6."/>
+- <contains string="${java.version}" substring="1.7."/>
+- </or>
+- </condition>
++ <property name="is.java6.plus" value="true"/>
<condition property="is.java5">
+ <contains string="${java.version}" substring="1.5."/>
+ </condition>
--- a/tools/build/build.xml
+++ b/tools/build/build.xml
@@ -20,7 +20,20 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/icu4j-4.4.git
More information about the pkg-java-commits
mailing list