[icu4j-4.2] 03/05: Fixed the build failure with Java 9 (Closes: #875402)

[Emmanuel Bourg]

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

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

commit 7eb09152b37d25078eb010c090c3de64e0a28608
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 8 17:23:25 2018 +0100

    Fixed the build failure with Java 9 (Closes: #875402)
---
 debian/changelog                            | 1 +
 debian/patches/01-java8-compatibility.patch | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 253b739..e1023b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 icu4j-4.2 (4.2.1.1-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #875402)
   * 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 d3af156..73a8fa3 100644
--- a/debian/patches/01-java8-compatibility.patch
+++ b/debian/patches/01-java8-compatibility.patch
@@ -3,13 +3,11 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -159,6 +159,9 @@
+@@ -159,6 +159,7 @@
      <condition property="target.rt.version" value="JAVASE7">
        <contains string="${java.version}" substring="1.7." />
      </condition>
-+    <condition property="target.rt.version" value="JAVASE8">
-+      <contains string="${java.version}" substring="1.8." />
-+    </condition>
++    <property name="target.rt.version" value="JAVASE8"/>
  
      <fail message="Failed to detect Java runtime library version used for building ICU4J"
            unless="target.rt.version" />

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