[pkg-java] r18045 - in trunk/jajuk/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-04-17 12:54:01 +0000 (Thu, 17 Apr 2014)
New Revision: 18045

Added:
   trunk/jajuk/debian/patches/04_java8_compatibility.diff
Modified:
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/patches/series
Log:
Patched the build script to recognize Java 8



Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2014-04-17 12:45:48 UTC (rev 18044)
+++ trunk/jajuk/debian/changelog	2014-04-17 12:54:01 UTC (rev 18045)
@@ -1,7 +1,8 @@
 jajuk (1:1.9.6-8) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Switched the dependency on mplayer to mplayer2
+  * Patched the build script to recognize Java 8
+  * Changed the dependency on mplayer to mplayer2
   * Switch to debhelper level 9
   * debian/control: Fixed the Vcs-Svn URL
   * Use XZ compression for the upstream tarball

Added: trunk/jajuk/debian/patches/04_java8_compatibility.diff
===================================================================
--- trunk/jajuk/debian/patches/04_java8_compatibility.diff	                        (rev 0)
+++ trunk/jajuk/debian/patches/04_java8_compatibility.diff	2014-04-17 12:54:01 UTC (rev 18045)
@@ -0,0 +1,36 @@
+Description: Modifies the build script to recognize Java 8
+Author: Emmanuel Bourg <ebourg at pache.org>
+Forwarded: no
+--- a/src/scripts/build.xml
++++ b/src/scripts/build.xml
+@@ -52,6 +52,7 @@
+ 	<!--CONST-->
+ 	<property name='jajuk.java.build.version6' value='1.6' />
+ 	<property name='jajuk.java.build.version7' value='1.7' />
++	<property name='jajuk.java.build.version8' value='1.8' />
+ 	<property name='rootdir' value='/tmp/jajuk-dist' />
+ 	<property name='installdir' value='/usr/share/jajuk/' />
+ 	<property name='jnidir' value='/usr/lib/jajuk/' />
+@@ -81,19 +82,20 @@
+ 	<property name='srcdir' value='${basedir}/src' />
+ 
+ 	<target name='get-jvm'>
+-		<echo message='Verifying Java Version used for building, found version ${java.specification.version}, expecting ${jajuk.java.build.version6} or ${jajuk.java.build.version7}' />
++		<echo message='Verifying Java Version used for building, found version ${java.specification.version}, expecting ${jajuk.java.build.version6}, ${jajuk.java.build.version7} or ${jajuk.java.build.version8}' />
+ 		<condition property='jvm.not.ok'>
+ 			<not>
+ 				<or>
+ 					<equals arg1='${java.specification.version}' arg2='${jajuk.java.build.version6}' />
+ 					<equals arg1='${java.specification.version}' arg2='${jajuk.java.build.version7}' />
++					<equals arg1='${java.specification.version}' arg2='${jajuk.java.build.version8}' />
+ 				</or>
+ 			</not>
+ 		</condition>
+ 	</target>
+ 
+ 	<target name='check-jvm' depends='get-jvm' if='jvm.not.ok'>
+-		<fail message='Wrong Java version used for building: ${java.specification.version}, the build requires version ${jajuk.java.build.version6} or ${jajuk.java.build.version7}' />
++		<fail message='Wrong Java version used for building: ${java.specification.version}, the build requires version ${jajuk.java.build.version6}, ${jajuk.java.build.version7} or ${jajuk.java.build.version8}' />
+ 	</target>
+ 
+ 	<target name='startup' depends='check-jvm'>

Modified: trunk/jajuk/debian/patches/series
===================================================================
--- trunk/jajuk/debian/patches/series	2014-04-17 12:45:48 UTC (rev 18044)
+++ trunk/jajuk/debian/patches/series	2014-04-17 12:54:01 UTC (rev 18045)
@@ -1,3 +1,4 @@
 01_override_manifest.diff
 02_lastfm_fix_0_1_0.diff
 03_validation.diff
+04_java8_compatibility.diff