This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository cdk.
commit 348b5614c1d414badc14e3963259e8309f4555ed Author: Emmanuel Bourg <[email protected]> Date: Tue May 13 13:44:11 2014 +0000 Fixed a build failure with Java 8 --- debian/changelog | 7 +++++++ debian/patches/java8-compatibility.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 30 insertions(+) diff --git a/debian/changelog b/debian/changelog index cdf0e1d..4f3eeb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cdk (1:1.2.10-6) unstable; urgency=medium + + * Team upload. + * Fixed a build failure with Java 8 + + -- Emmanuel Bourg <[email protected]> Tue, 13 May 2014 15:36:50 +0200 + cdk (1:1.2.10-5) unstable; urgency=medium * Team upload. diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch new file mode 100644 index 0000000..1cff201 --- /dev/null +++ b/debian/patches/java8-compatibility.patch @@ -0,0 +1,22 @@ +Description: Fixes the detection of the JDK to build with Java 8 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -193,13 +193,11 @@ + </or> + </condition> + <condition property="isNotJava15+"> +- <not> + <or> +- <contains string="${java.version}" substring="1.5"/> +- <contains string="${java.version}" substring="1.6"/> +- <contains string="${java.version}" substring="1.7"/> ++ <contains string="${java.version}" substring="1.2"/> ++ <contains string="${java.version}" substring="1.3"/> ++ <contains string="${java.version}" substring="1.4"/> + </or> +- </not> + </condition> + <fail if="isNotJava15+" message="This CDK release requires Java5 or better."/> + <fail unless="hasAnt17" message="This CDK release requires Ant 1.7.1 or better."/> diff --git a/debian/patches/series b/debian/patches/series index 4b5f497..03553c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 22_fix_build.patch ant19.patch jama-1.0.3.patch +java8-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
