[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 03ad2725bc324eae90cc584798a4ef49e45db2e2
Author: Jan Dittberner <jandd at debian.org>
Date:   Thu May 27 22:15:27 2010 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 1d08625..2fb128a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 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
+  * debian/patches/0002-use-Debian-java-libs.patch:
+    - remove empty ${myJLibDir} from classpath in
+      AI/Interfaces/Java/CMakeLists.txt
+    - use -classpath instead of -cp
   * refresh debian/patches/0001-Minor-spelling-fix.patch
 
  -- Jan Dittberner <jandd at debian.org>  Thu, 27 May 2010 21:10:29 +0200
diff --git a/debian/patches/0002-use-Debian-java-libs.patch b/debian/patches/0002-use-Debian-java-libs.patch
index e4a61c3..506bbe5 100644
--- a/debian/patches/0002-use-Debian-java-libs.patch
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -14,6 +14,15 @@ Author: Jan Dittberner <jandd at debian.org>
  
  			# Create a list of all the AIs source files
  			file(GLOB_RECURSE mySources RELATIVE "${mySourceDir}" FOLLOW_SYMLINKS "${mySourceDir}/*.java")
+@@ -215,7 +215,7 @@
+ 				DEPENDS ${Java_AIINTERFACE_TARGET}
+ 				COMMAND "${JAVA_COMPILE}"
+ 					"${JAVA_COMPILE_FLAG_CONDITIONAL}"
+-					"-cp" "${myClassPath}"
++					"-classpath" "${myClassPath}"
+ 					"-d" "${myJavaBuildDir}"
+ 					${mySources}
+ 				COMMAND "${JAVA_ARCHIVE}"
 @@ -349,9 +349,9 @@
  	set(mySrcJarFile               "${myJarFile}-src.jar")
  	set(myJavaGeneratedSourceDir   "${myBuildDir}/src-generated/main/java")
@@ -27,6 +36,15 @@ Author: Jan Dittberner <jandd at debian.org>
  
  	# Used by Java Skirmish AIs
  	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
+@@ -437,7 +437,7 @@
+ 		DEPENDS "${myJavaGeneratedSourceDir}/${myPkg}/oo/*.java"
+ 		COMMAND "${JAVA_COMPILE}" ARGS
+ 		"${JAVA_COMPILE_FLAG_CONDITIONAL}"
+-		"-cp" "${myClassPath}"
++		"-classpath" "${myClassPath}"
+ 		"-d" "${myJavaBuildDir}"
+ 		${JAVA_GENERATED_SOURCES}
+ 		WORKING_DIRECTORY "${myJavaGeneratedSourceDir}"
 --- a/AI/Skirmish/HughAI/CMakeLists.txt
 +++ b/AI/Skirmish/HughAI/CMakeLists.txt
 @@ -47,7 +47,7 @@

-- 
advanced 3D real time strategy game engine