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

sebastic pushed a commit to branch master
in repository libkml.

commit 2189868c139052b44564db0a7072e7a67fafc010
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Aug 2 19:17:13 2015 +0200

    Add patch to fix SWIG Java library install path.
---
 debian/changelog                                    |  1 +
 debian/patches/java-swig-library-install-path.patch | 16 ++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e96e2cc..7b24bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libkml (1.3.0~rc0-1) UNRELEASED; urgency=medium
   * Update symbols for amd64.
   * Add patch to fix pkgconfig install path.
   * Include libkml.pc in libkml-dev.
+  * Add patch to fix SWIG Java library install path.
 
  -- Bas Couwenberg <sebas...@debian.org>  Sun, 02 Aug 2015 17:40:59 +0200
 
diff --git a/debian/patches/java-swig-library-install-path.patch 
b/debian/patches/java-swig-library-install-path.patch
new file mode 100644
index 0000000..71d7dc0
--- /dev/null
+++ b/debian/patches/java-swig-library-install-path.patch
@@ -0,0 +1,16 @@
+Description: Fix SWIG Java shared library install path (/usr/share/java -> 
/usr/lib)
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: https://github.com/libkml/libkml/pull/204
+Applied-Upstream: 
https://github.com/libkml/libkml/commit/57de6a779115cb4dfbf9be4f20db0128fb163df6
+
+--- 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 ${JAVA_INSTALL_DIR})
++    install(TARGETS ${MODULE_NAME}_swig_java DESTINATION ${LIB_INSTALL_DIR})
+ 
+   endforeach()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 877582d..11976f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 pkgconfig-install-path.patch
+java-swig-library-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

Reply via email to