Author: ebourg-guest Date: 2014-05-13 13:44:11 +0000 (Tue, 13 May 2014) New Revision: 18138
Added: trunk/cdk/debian/patches/java8-compatibility.patch Modified: trunk/cdk/debian/changelog trunk/cdk/debian/patches/series Log: Fixed a build failure with Java 8 Modified: trunk/cdk/debian/changelog =================================================================== --- trunk/cdk/debian/changelog 2014-05-13 12:50:50 UTC (rev 18137) +++ trunk/cdk/debian/changelog 2014-05-13 13:44:11 UTC (rev 18138) @@ -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. Added: trunk/cdk/debian/patches/java8-compatibility.patch =================================================================== --- trunk/cdk/debian/patches/java8-compatibility.patch (rev 0) +++ trunk/cdk/debian/patches/java8-compatibility.patch 2014-05-13 13:44:11 UTC (rev 18138) @@ -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."/> Modified: trunk/cdk/debian/patches/series =================================================================== --- trunk/cdk/debian/patches/series 2014-05-13 12:50:50 UTC (rev 18137) +++ trunk/cdk/debian/patches/series 2014-05-13 13:44:11 UTC (rev 18138) @@ -1,3 +1,4 @@ 22_fix_build.patch ant19.patch jama-1.0.3.patch +java8-compatibility.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
