[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.81.2.1+dfsg1-2-6-g40c9d60

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 40c9d60b132877f7bed4a59c45a5425061d1cfa9
Author: Jan Dittberner <jandd at debian.org>
Date:   Mon Apr 5 23:03:57 2010 +0200

    add jna.jar and vecmath.jar to class path

diff --git a/debian/patches/0002-use-Debian-java-libs.patch b/debian/patches/0002-use-Debian-java-libs.patch
index ac1347a..2da7063 100644
--- a/debian/patches/0002-use-Debian-java-libs.patch
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -3,6 +3,15 @@ Subject: use Debian packaged versions of jna.jar and vecmath.jar
 Author: Jan Dittberner <jandd at debian.org>
 --- a/AI/Interfaces/Java/CMakeLists.txt
 +++ b/AI/Interfaces/Java/CMakeLists.txt
+@@ -195,7 +195,7 @@
+ 
+ 			# Create our full Java class-path
+ 			CreateClasspath(myJavaLibs ${myJLibDir})
+-			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}")
++			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
+ 
+ 			# Create a list of all the AIs source files
+ 			file(GLOB_RECURSE mySources RELATIVE "${mySourceDir}" FOLLOW_SYMLINKS "${mySourceDir}/*.java")
 @@ -349,9 +349,9 @@
  	set(mySrcJarFile               "${myJarFile}-src.jar")
  	set(myJavaGeneratedSourceDir   "${myBuildDir}/src-generated/main/java")
@@ -15,3 +24,14 @@ Author: Jan Dittberner <jandd at debian.org>
  
  	# Used by Java Skirmish AIs
  	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
+--- a/AI/Skirmish/HughAI/CMakeLists.txt
++++ b/AI/Skirmish/HughAI/CMakeLists.txt
+@@ -47,7 +47,7 @@
+ 
+ 		# Create our full Java class-path
+ 		CreateClasspath(myJavaLibs ${myJLibDir})
+-		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir})
++		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir} "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
+ 
+ 		# Create a list of all the AIs source files
+ 		file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
diff --git a/debian/patches/series b/debian/patches/series
index 922d393..605d1df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0003-fix-cmake-2_8-java-build.patch
 0001-Minor-spelling-fix.patch
 0002-use-Debian-java-libs.patch
+0003-fix-cmake-2_8-java-build.patch

-- 
advanced 3D real time strategy game engine