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

[Jan Dittberner]

The following commit has been merged in the master branch:
commit b42f938f2883214cc58dbd44e39a0f167fa5dfae
Author: Jan Dittberner <jandd at debian.org>
Date:   Thu May 27 21:11:04 2010 +0200

    debian/patches/0002-use-Debian-java-libs.patch: remove empty ${myJLibDir} from classpath in AI/Interfaces/Java/CMakeLists.txt

diff --git a/debian/changelog b/debian/changelog
index e78673e..55452e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+spring (0.81.2.1+dfsg1-5) UNRELEASED; urgency=low
+
+  * debian/patches/0002-use-Debian-java-libs.patch: remove empty
+    ${myJLibDir} from classpath in AI/Interfaces/Java/CMakeLists.txt
+
+ -- Jan Dittberner <jandd at debian.org>  Thu, 27 May 2010 21:10:29 +0200
+
 spring (0.81.2.1+dfsg1-4) unstable; urgency=low
 
   * add debian/spring-javaai.links to add links to jna.jar and vecmath.jar
diff --git a/debian/patches/0002-use-Debian-java-libs.patch b/debian/patches/0002-use-Debian-java-libs.patch
index 2da7063..e4a61c3 100644
--- a/debian/patches/0002-use-Debian-java-libs.patch
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -3,12 +3,14 @@ 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 @@
+@@ -194,8 +194,8 @@
+ 			set(myJavaBuildDir  "${myBuildDir}/classes")
  
  			# Create our full Java class-path
- 			CreateClasspath(myJavaLibs ${myJLibDir})
+-			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")
++			#CreateClasspath(myJavaLibs ${myJLibDir})
++			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/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")
@@ -17,10 +19,11 @@ Author: Jan Dittberner <jandd at debian.org>
  	set(myJavaGeneratedSourceDir   "${myBuildDir}/src-generated/main/java")
  	set(myJLibDir                  "${myDir}/data/jlib")
 -	#set(myJavaLibs                 "${myJLibDir}/jna/jna.jar${PATH_DELIM_H}${myJLibDir}/vecmath.jar")
-+	set(myDebianJavaLibs           "/usr/share/java/jna.jar${PATH_DELIM_H}/usr/share/java/vecmath.jar")
- 	CreateClasspath(myJavaLibs ${myJLibDir})
+-	CreateClasspath(myJavaLibs ${myJLibDir})
 -	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
-+	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myDebianJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
++	set(myDebianJavaLibs           "/usr/share/java/jna.jar${PATH_DELIM_H}/usr/share/java/vecmath.jar")
++	#CreateClasspath(myJavaLibs ${myJLibDir})
++	set(myClassPath                ".${PATH_DELIM_H}${myDebianJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
  
  	# Used by Java Skirmish AIs
  	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")

-- 
advanced 3D real time strategy game engine