[spring] 04/12: Drop use-Debian-java-libs.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository spring.

commit a786aebf7da14fc431e011f681bceddfdbc05680
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jul 6 00:38:13 2015 +0200

    Drop use-Debian-java-libs.patch
---
 debian/patches/series                     |   1 -
 debian/patches/use-Debian-java-libs.patch | 112 ------------------------------
 2 files changed, 113 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index d95fdd4..dfb098a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-use-Debian-java-libs.patch
 glShaderSource.patch
 sdl-debian.patch
diff --git a/debian/patches/use-Debian-java-libs.patch b/debian/patches/use-Debian-java-libs.patch
deleted file mode 100644
index d76b286..0000000
--- a/debian/patches/use-Debian-java-libs.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From: Jan Dittberner <jandd at debian.org>
-Date: Sun, 8 Dec 2013 16:22:37 +0100
-Subject: use Debian java libs
-
-Forwarded: not-needed
----
- AI/Interfaces/Java/CMakeLists.txt | 17 ++++++++---------
- AI/Skirmish/HughAI/CMakeLists.txt | 10 +++++-----
- 2 files changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/AI/Interfaces/Java/CMakeLists.txt b/AI/Interfaces/Java/CMakeLists.txt
-index 8c74470..f7ebe4b 100644
---- a/AI/Interfaces/Java/CMakeLists.txt
-+++ b/AI/Interfaces/Java/CMakeLists.txt
-@@ -42,7 +42,6 @@ macro    (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
- 	set(myJarFile       "SkirmishAI")
- 	set(myBinJarFile    "${myJarFile}.jar")
- 	set(mySrcJarFile    "${myJarFile}-src.jar")
--	set(myJLibDir       "${myDir}/data/jlib")
- 	GetVersionPlusDepFile(myVersion myVersionDepFile)
- 	set(myTarget        "${myName}")
- 	set(myInstLibsDir   "${SKIRMISH_AI_LIBS}/${myName}/${myVersion}")
-@@ -169,8 +168,8 @@ macro    (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
- 			add_dependencies(${myTarget} ${myBinaryTarget} ${mySourceTarget})
- 
- 			# Create our full Java class-path
--			CreateClasspath(myJavaLibs ${myJLibDir})
--			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}")
-+			#CreateClasspath(myJavaLibs ${myJLibDir})
-+			ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
- 			foreach    (wrapperName ${wrapperNames})
- 				ConcatClasspaths(myClassPath "${myClassPath}" "${${wrapperName}_AIWRAPPER_JAR_CLASSPATH}")
- 			endforeach (wrapperName)
-@@ -207,7 +206,7 @@ macro    (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
- 				COMMAND "${JAVA_COMPILE}"
- 					"${JAVA_COMPILE_FLAG_CONDITIONAL}"
- 					"-Xlint:deprecation"
--					"-cp" "${myClassPath}"
-+					"-classpath" "${myClassPath}"
- 					"-d" "${myJavaBuildDir}"
- 					"@${mySrcArgFile}"
- 				COMMAND "${JAVA_ARCHIVE}"
-@@ -386,9 +385,9 @@ if    (BUILD_${myName}_AIINTERFACE)
- 	set(myGeneratedSourceDir       "${myBuildDir}/src-generated/main")
- 	set(myJavaGeneratedSourceDir   "${myGeneratedSourceDir}/java")
- 	set(myNativeGeneratedSourceDir "${myGeneratedSourceDir}/native")
--	set(myJLibDir                  "${myDir}/data/jlib")
--	CreateClasspath(myJavaLibs ${myJLibDir})
--	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
-+	#set(myJLibDir                  "${myDir}/data/jlib")
-+	#CreateClasspath(myJavaLibs ${myJLibDir})
-+	set(myClassPath                ".${PATH_DELIM_H}${myJavaSourceDir}${PATH_DELIM_H}/usr/share/java/jna.jar${PATH_DELIM_H}/usr/share/java/vecmath.jar")
- 
- 	# Used by Java Skirmish AIs
- 	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE      "${myDir}")
-@@ -396,7 +395,7 @@ if    (BUILD_${myName}_AIINTERFACE)
- 	SetGlobal(${myName}_AIINTERFACE_JAR_BIN          "${myBuildDir}/${myBinJarFile}")
- 	SetGlobal(${myName}_AIINTERFACE_JAR_SRC          "${myBuildDir}/${mySrcJarFile}")
- 	SetGlobal(${myName}_AIINTERFACE_POM              "${myBuildDir}/pom-generated.xml")
--	SetGlobal(CLASSPATH_${myName}_AIINTERFACE        "${myJavaLibs}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
-+	SetGlobal(CLASSPATH_${myName}_AIINTERFACE        "${myClassPath}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
- 	SetGlobal(JAVA_SRC_DIR_${myName}_AIINTERFACE     "${myJavaSourceDir}")
- 	SetGlobal(JAVA_GEN_SRC_DIR_${myName}_AIINTERFACE "${myJavaGeneratedSourceDir}")
- 	SetGlobal(${myName}_AIINTERFACE_TARGET_MVN_INSTALL "${myMavenInstallTarget}")
-@@ -645,7 +644,7 @@ if    (BUILD_${myName}_AIINTERFACE)
- 		COMMAND "${JAVA_COMPILE}" ARGS
- 			"${JAVA_COMPILE_FLAG_CONDITIONAL}"
- 			"-Xlint:deprecation"
--			"-cp" "${myClassPath}"
-+			"-classpath" "${myClassPath}"
- 			"-d" "${myJavaBuildDir}"
- 			"@${mySrcArgFile}"
- 		COMMAND "${JAVA_ARCHIVE}" ARGS
-diff --git a/AI/Skirmish/HughAI/CMakeLists.txt b/AI/Skirmish/HughAI/CMakeLists.txt
-index 9299bbb..fceb9df 100644
---- a/AI/Skirmish/HughAI/CMakeLists.txt
-+++ b/AI/Skirmish/HughAI/CMakeLists.txt
-@@ -41,13 +41,13 @@
- 		set(myAiBinJarFile       "${myAiJarFile}.jar")
- 		set(myLoaderSrcJarFile   "${myLoaderJarFile}-src.jar")
- 		set(myAiSrcJarFile       "${myAiJarFile}-src.jar")
--		set(myJLibDir            "${myDir}/data/jlib")
-+		#set(myJLibDir            "${myDir}/data/jlib")
- 
- 		SkirmishAIMessage(STATUS "Found Skirmish AI: ${myName} ${myVersion}")
- 
- 		# Create our full Java class-path
--		CreateClasspath(myJavaLibs ${myJLibDir})
--		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir} ${JavaOO_AIWRAPPER_JAR_CLASSPATH})
-+		#CreateClasspath(myJavaLibs ${myJLibDir})
-+		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar" ${myAiSourceDir} ${myLoaderSourceDir} ${JavaOO_AIWRAPPER_JAR_CLASSPATH})
- 
- 		# Create a list of all the AIs source files (for compiling)
- 		file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
-@@ -86,7 +86,7 @@
- 				"-E" "make_directory" "${myJavaLoaderBuildDir}"
- 			COMMAND "${JAVA_COMPILE}"
- 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
--				"-cp" "${myClassPath}"
-+				"-classpath" "${myClassPath}"
- 				"-d" "${myJavaLoaderBuildDir}"
- 				${myLoaderSources}
- 			COMMAND "${JAVA_ARCHIVE}"
-@@ -109,7 +109,7 @@
- 				"-E" "make_directory" "${myJavaAiBuildDir}"
- 			COMMAND "${JAVA_COMPILE}"
- 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
--				"-cp" "${myClassPath}"
-+				"-classpath" "${myClassPath}"
- 				"-d" "${myJavaAiBuildDir}"
- 				${myAiSources}
- 			COMMAND "${JAVA_ARCHIVE}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/spring.git