[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 0f951f230c2895f3904c5c065a4350d2b8803d7e
Author: Jan Dittberner <jandd at debian.org>
Date:   Sun Apr 4 14:58:22 2010 +0200

    add patch for AI/Interfaces/Java/CMakeLists.txt to use Debian versions of jna.jar and vecmath.jar

diff --git a/debian/changelog b/debian/changelog
index 84cd882..c367aa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ spring (0.81.2.1+dfsg1-3) UNRELEASED; urgency=low
   * enable Java-AI-Interface
    - debian/control: add libvecmath-java and libjna-java to Build-Depends
    - debian/rules: switch AI_TYPES configure argument from NATIVE to ALL
+   - add debian/patches/0002-use-Debian-java-libs.patch to use jar files
+     from libvecmath-java and libjna-java
 
  -- Jan Dittberner <jandd at debian.org>  Mon, 05 Apr 2010 00:59:08 +0200
 
diff --git a/debian/patches/0002-use-Debian-java-libs.patch b/debian/patches/0002-use-Debian-java-libs.patch
new file mode 100644
index 0000000..ac1347a
--- /dev/null
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -0,0 +1,17 @@
+Subject: use Debian packaged versions of jna.jar and vecmath.jar
+ instead of those removed from the upstream tarball
+Author: Jan Dittberner <jandd at debian.org>
+--- a/AI/Interfaces/Java/CMakeLists.txt
++++ b/AI/Interfaces/Java/CMakeLists.txt
+@@ -349,9 +349,9 @@
+ 	set(mySrcJarFile               "${myJarFile}-src.jar")
+ 	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})
+-	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
++	set(myClassPath                ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myDebianJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
+ 
+ 	# Used by Java Skirmish AIs
+ 	SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
diff --git a/debian/patches/series b/debian/patches/series
index e55adce..068ec36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Minor-spelling-fix.patch
+0002-use-Debian-java-libs.patch
diff --git a/debian/rules b/debian/rules
index 77fb11d..a5520f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 TMPINSTDIR := $(CURDIR)/debian/tmp
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

-- 
advanced 3D real time strategy game engine