[pkg-java] r18068 - in trunk/libjibx-java/branch-1.2/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-25 08:53:52 +0000 (Fri, 25 Apr 2014)
New Revision: 18068

Added:
   trunk/libjibx-java/branch-1.2/debian/patches/02_java8_compatibility.patch
Modified:
   trunk/libjibx-java/branch-1.2/debian/changelog
   trunk/libjibx-java/branch-1.2/debian/patches/series
Log:
Modified the detection of the JDK to build with Java 8



Modified: trunk/libjibx-java/branch-1.2/debian/changelog
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/changelog	2014-04-25 06:32:14 UTC (rev 18067)
+++ trunk/libjibx-java/branch-1.2/debian/changelog	2014-04-25 08:53:52 UTC (rev 18068)
@@ -1,3 +1,10 @@
+libjibx1.2-java (1.2.3-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Modified the detection of the JDK to build with Java 8
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 25 Apr 2014 10:48:59 +0200
+
 libjibx1.2-java (1.2.3-3) unstable; urgency=low
 
   [ Stephen Nelson ]

Added: trunk/libjibx-java/branch-1.2/debian/patches/02_java8_compatibility.patch
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/patches/02_java8_compatibility.patch	                        (rev 0)
+++ trunk/libjibx-java/branch-1.2/debian/patches/02_java8_compatibility.patch	2014-04-25 08:53:52 UTC (rev 18068)
@@ -0,0 +1,18 @@
+Description: Modifies the detection of the JDK to build with Java 8
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -49,11 +49,7 @@
+     </not>
+   </condition>
+   <condition property="java5">
+-    <or>
+-      <equals arg1="${ant.java.version}" arg2="1.5"/>
+-      <equals arg1="${ant.java.version}" arg2="1.6"/>
+-      <equals arg1="${ant.java.version}" arg2="1.7"/>
+-    </or>
++    <istrue value="true"/>
+   </condition>
+ 
+   <!-- Common classpaths -->

Modified: trunk/libjibx-java/branch-1.2/debian/patches/series
===================================================================
--- trunk/libjibx-java/branch-1.2/debian/patches/series	2014-04-25 06:32:14 UTC (rev 18067)
+++ trunk/libjibx-java/branch-1.2/debian/patches/series	2014-04-25 08:53:52 UTC (rev 18068)
@@ -1,2 +1,3 @@
 build_xml_clean_target.patch
 01_build_xml.patch
+02_java8_compatibility.patch