This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libkml.
commit 3bace5a317fb5308f37724bda19afaddcff873cd Author: Bas Couwenberg <[email protected]> Date: Sun Jul 26 00:22:44 2015 +0200 Update install-paths.patch with upstream changes to fix header installation. --- debian/changelog | 6 ++++++ debian/patches/include-path.patch | 38 ++++++++++++++++++++++++++++++++++++++ debian/patches/install-paths.patch | 7 ++++--- debian/patches/series | 1 + 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7d60fe1..c2a69e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libkml (1.3.0~r864+git20150723-0fa2f22-1~exp2) UNRELEASED; urgency=medium + + * Update install-paths.patch with upstream changes to fix header installation. + + -- Bas Couwenberg <[email protected]> Sun, 26 Jul 2015 00:22:12 +0200 + libkml (1.3.0~r864+git20150723-0fa2f22-1~exp1) experimental; urgency=medium * Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency. diff --git a/debian/patches/include-path.patch b/debian/patches/include-path.patch new file mode 100644 index 0000000..e31e2cf --- /dev/null +++ b/debian/patches/include-path.patch @@ -0,0 +1,38 @@ +Description: Fix include path, from kmlbase/attributes.h to kml/base/attributes.h. +Author: Bas Couwenberg <[email protected]> +Bug: https://github.com/libkml/libkml/pull/198 +Origin: https://github.com/libkml/libkml/commit/8601371365f7ce5e40215d7a5f3dce22e045ac5c +Forwarded: https://github.com/libkml/libkml/pull/199 +Applied-Upstream: https://github.com/libkml/libkml/commit/94a80ce7ae969b7036895da5f0b476d81981465c + +--- a/cmake/LibKMLHelper.cmake ++++ b/cmake/LibKMLHelper.cmake +@@ -21,7 +21,7 @@ macro(build_target) + string(SUBSTRING ${LIB_NAME} 3 ${${LIB_NAME}_END} ${LIB_NAME}_INCLUDE_DIR) + install( + FILES ${LIB_INCS} +- DESTINATION ${INCLUDE_INSTALL_DIR}/${LIB_NAME}) ++ DESTINATION ${INCLUDE_INSTALL_DIR}/${${LIB_NAME}_INCLUDE_DIR}) + + install_target(${LIB_NAME}) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ if(NOT DEFINED DATA_INSTALL_DIR) + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share") + endif(NOT DEFINED DATA_INSTALL_DIR) + if(NOT DEFINED INCLUDE_INSTALL_DIR) +- set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") ++ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/kml") + endif(NOT DEFINED INCLUDE_INSTALL_DIR) + if(NOT DEFINED MAN_INSTALL_DIR) + set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man") +--- a/src/kml/CMakeLists.txt ++++ b/src/kml/CMakeLists.txt +@@ -7,5 +7,5 @@ add_subdirectory(regionator) + + + install( FILES dom.h engine.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/kml ++ DESTINATION ${INCLUDE_INSTALL_DIR} + COMPONENT Development) diff --git a/debian/patches/install-paths.patch b/debian/patches/install-paths.patch index 0e0220e..4c99a45 100644 --- a/debian/patches/install-paths.patch +++ b/debian/patches/install-paths.patch @@ -1,6 +1,7 @@ Description: Add user customizable install paths. Author: Bas Couwenberg <[email protected]> Forwarded: https://github.com/libkml/libkml/pull/198 +Applied-Upstream: https://github.com/libkml/libkml/commit/361643ce925bd06e16f2311badabf1d05714e75d --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +19,7 @@ Forwarded: https://github.com/libkml/libkml/pull/198 + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share") +endif(NOT DEFINED DATA_INSTALL_DIR) +if(NOT DEFINED INCLUDE_INSTALL_DIR) -+ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/kml") ++ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") +endif(NOT DEFINED INCLUDE_INSTALL_DIR) +if(NOT DEFINED MAN_INSTALL_DIR) + set(MAN_INSTALL_DIR "${DATA_INSTALL_DIR}/man") @@ -40,7 +41,7 @@ Forwarded: https://github.com/libkml/libkml/pull/198 install( FILES ${LIB_INCS} - DESTINATION include/${${LIB_NAME}_INCLUDE_DIR}) -+ DESTINATION ${INCLUDE_INSTALL_DIR}) ++ DESTINATION ${INCLUDE_INSTALL_DIR}/${LIB_NAME}) install_target(${LIB_NAME}) @@ -64,5 +65,5 @@ Forwarded: https://github.com/libkml/libkml/pull/198 install( FILES dom.h engine.h - DESTINATION include/kml -+ DESTINATION ${INCLUDE_INSTALL_DIR} ++ DESTINATION ${INCLUDE_INSTALL_DIR}/kml COMPONENT Development) diff --git a/debian/patches/series b/debian/patches/series index 3dbc72e..ae67119 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ java-run-sh-shebang.diff compiler-flags.patch soversion.patch install-paths.patch +include-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
