This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository libkml.
commit fa33ec1a0d9242e8facf2019eec50e303af23ffa
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Aug 2 22:12:01 2015 +0200
Add patch to install the SWIG Java libraries in a JNI specific path.
---
debian/changelog | 1 +
debian/libkml-dev.install | 7 +------
debian/libkml-java.install | 2 +-
debian/patches/jni-install-path.patch | 28 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
5 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 794dc0c..e29ac93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libkml (1.3.0~rc0-1) UNRELEASED; urgency=medium
* Include libkml.pc in libkml-dev.
* Add patch to fix SWIG Java library install path.
* Include SWIG Java libraries in libkml-java.
+ * Add patch to install the SWIG Java libraries in a JNI specific path.
-- Bas Couwenberg <sebas...@debian.org> Sun, 02 Aug 2015 17:40:59 +0200
diff --git a/debian/libkml-dev.install b/debian/libkml-dev.install
index 6e5b381..58a833b 100644
--- a/debian/libkml-dev.install
+++ b/debian/libkml-dev.install
@@ -1,8 +1,3 @@
usr/include/
-usr/lib/*/libkmlbase.so
-usr/lib/*/libkmlconvenience.so
-usr/lib/*/libkmldom.so
-usr/lib/*/libkmlengine.so
-usr/lib/*/libkmlregionator.so
-usr/lib/*/libkmlxsd.so
+usr/lib/*/lib*.so
usr/lib/*/pkgconfig/
diff --git a/debian/libkml-java.install b/debian/libkml-java.install
index 9059151..b135b1d 100644
--- a/debian/libkml-java.install
+++ b/debian/libkml-java.install
@@ -1,2 +1,2 @@
usr/share/java
-usr/lib/*/*_swig_java.so
+usr/lib/*/jni
diff --git a/debian/patches/jni-install-path.patch
b/debian/patches/jni-install-path.patch
new file mode 100644
index 0000000..ecf03f7
--- /dev/null
+++ b/debian/patches/jni-install-path.patch
@@ -0,0 +1,28 @@
+Description: Fix JNI library installation path (usr/lib -> usr/lib/jni)
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: https://github.com/libkml/libkml/pull/205
+Applied-Upstream:
https://github.com/libkml/libkml/commit/723d85add8100640c2cd99afec19c09a968f3325
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,6 +52,9 @@ endif(NOT DEFINED LOCALE_INSTALL_DIR)
+ if(NOT DEFINED JAVA_INSTALL_DIR)
+ set(JAVA_INSTALL_DIR "${DATA_INSTALL_DIR}/java")
+ endif(NOT DEFINED JAVA_INSTALL_DIR)
++if(NOT DEFINED JNI_INSTALL_DIR)
++ set(JNI_INSTALL_DIR "${LIB_INSTALL_DIR}/jni")
++endif(NOT DEFINED JNI_INSTALL_DIR)
+ if(NOT DEFINED PKGCONFIG_INSTALL_DIR)
+ set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig")
+ endif(NOT DEFINED PKGCONFIG_INSTALL_DIR)
+--- a/src/swig/CMakeLists.txt
++++ b/src/swig/CMakeLists.txt
+@@ -77,7 +77,7 @@ if(WITH_JAVA)
+ set_source_files_properties(
${CMAKE_CURRENT_BINARY_DIR}/${MODULE_NAME}JAVA_wrap.cxx COMPILE_FLAGS "-w")
+ swig_add_module(${MODULE_NAME}_swig_java java ${INTERFACE_FILE})
+ swig_link_libraries(${MODULE_NAME}_swig_java ${MODULE_NAME})
+- install(TARGETS ${MODULE_NAME}_swig_java DESTINATION ${LIB_INSTALL_DIR})
++ install(TARGETS ${MODULE_NAME}_swig_java DESTINATION ${JNI_INSTALL_DIR})
+
+ endforeach()
+
diff --git a/debian/patches/series b/debian/patches/series
index 11976f8..9c316e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
pkgconfig-install-path.patch
java-swig-library-install-path.patch
+jni-install-path.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/libkml.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
