[icu4j-4.4] 03/03: Fixed the build to compile with Java 8

[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.4.

commit 89def8b35c668a8187d055ea939fc62f9968be19
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Apr 12 11:53:04 2014 +0200

    Fixed the build to compile with Java 8
---
 debian/changelog                            |  1 +
 debian/patches/01-java8-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 11691bd..835e0e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 icu4j-4.4 (4.4.2.2-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 8
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch
new file mode 100644
index 0000000..933ce8f
--- /dev/null
+++ b/debian/patches/01-java8-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fixes the detection of the JDK to allow the compilation with Java 8
+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>
+     <condition property="is.java5">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3209aba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java8-compatibility.patch

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