This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libkml.
commit ccc47fe2221041f83c7e644c6ec20e1e56c26cbd Author: Bas Couwenberg <[email protected]> Date: Wed Nov 25 01:27:24 2015 +0100 Drop patches, applied upstream. --- debian/changelog | 1 + .../patches/java-swig-library-install-path.patch | 16 ------------- debian/patches/jni-install-path.patch | 28 ---------------------- debian/patches/pkgconfig-install-path.patch | 26 -------------------- debian/patches/series | 3 --- 5 files changed, 1 insertion(+), 73 deletions(-) diff --git a/debian/changelog b/debian/changelog index 40743a8..f438e54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libkml (1.3.0~rc1-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop patches, applied upstream. -- Bas Couwenberg <[email protected]> Wed, 25 Nov 2015 01:24:20 +0100 diff --git a/debian/patches/java-swig-library-install-path.patch b/debian/patches/java-swig-library-install-path.patch deleted file mode 100644 index 71d7dc0..0000000 --- a/debian/patches/java-swig-library-install-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix SWIG Java shared library install path (/usr/share/java -> /usr/lib) -Author: Bas Couwenberg <[email protected]> -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/jni-install-path.patch b/debian/patches/jni-install-path.patch deleted file mode 100644 index ecf03f7..0000000 --- a/debian/patches/jni-install-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Fix JNI library installation path (usr/lib -> usr/lib/jni) -Author: Bas Couwenberg <[email protected]> -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/pkgconfig-install-path.patch b/debian/patches/pkgconfig-install-path.patch deleted file mode 100644 index 3cf5e9c..0000000 --- a/debian/patches/pkgconfig-install-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix pkgconfig install path (<prefix>/lib/pkgconfig) -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/libkml/libkml/pull/203 -Applied-Upstream: https://github.com/libkml/libkml/commit/8ba168a477696de292ca9614eb837a9283a24707 - ---- 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 PKGCONFIG_INSTALL_DIR) -+ set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") -+endif(NOT DEFINED PKGCONFIG_INSTALL_DIR) - - # Path to additional CMake modules - set(CMAKE_MODULE_PATH -@@ -131,7 +134,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmak - "${CMAKE_BINARY_DIR}/libkml.pc" @ONLY) - - install(FILES ${CMAKE_BINARY_DIR}/libkml.pc -- DESTINATION ${DATA_INSTALL_DIR}) -+ DESTINATION ${PKGCONFIG_INSTALL_DIR}) - - if(BUILD_TESTING) - enable_testing() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 9c316e2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
