[icu4j] 29/29: Refresh patches

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Tue Mar 1 08:52:50 UTC 2016


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

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

commit 234c9188bac17ff12c7751d421681b0d0668a41e
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Tue Mar 1 16:00:20 2016 +0800

    Refresh patches
---
 debian/changelog                            |  1 +
 debian/patches/01-java8-compatibility.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99fa999..7dda6bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ icu4j (56.1-1) UNRELEASED; urgency=medium
   * Add myself to Uploaders
   * get-orig-source: Download released tarballs instead of checking out SVN
   * Update d/copyright to the standardized format
+  * Refresh patches
 
  -- Kai-Chung Yan <seamlikok at gmail.com>  Mon, 29 Feb 2016 14:48:30 +0800
 
diff --git a/debian/patches/01-java8-compatibility.patch b/debian/patches/01-java8-compatibility.patch
index d3af156..dc412ec 100644
--- a/debian/patches/01-java8-compatibility.patch
+++ b/debian/patches/01-java8-compatibility.patch
@@ -3,13 +3,13 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -159,6 +159,9 @@
-     <condition property="target.rt.version" value="JAVASE7">
-       <contains string="${java.version}" substring="1.7." />
+@@ -86,6 +86,9 @@
+     <condition property="is.java7">
+             <contains string="${java.version}" substring="1.7."/>
      </condition>
 +    <condition property="target.rt.version" value="JAVASE8">
 +      <contains string="${java.version}" substring="1.8." />
 +    </condition>
  
-     <fail message="Failed to detect Java runtime library version used for building ICU4J"
-           unless="target.rt.version" />
+     <condition property="is.java7.plus">
+         <or>

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



More information about the pkg-java-commits mailing list