This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdal.
commit 2681de1f54f489fefc054e22b0e3f01c0e766bbc Author: Bas Couwenberg <[email protected]> Date: Mon Aug 29 19:33:01 2016 +0200 Drop patches applied upstream. --- debian/changelog | 2 -- debian/patches/bash-completion.patch | 19 ------------------- debian/patches/cmake-3.6-hdf5.patch | 19 ------------------- debian/patches/series | 2 -- 4 files changed, 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 49b87f2..bae1a27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ pdal (1.3.0-1) UNRELEASED; urgency=medium * New upstream release. - * Add patch to fix HDF5 include directory with CMake >= 3.6.0. - * Add patch to fix bash-completion installation. -- Bas Couwenberg <[email protected]> Mon, 29 Aug 2016 19:29:39 +0200 diff --git a/debian/patches/bash-completion.patch b/debian/patches/bash-completion.patch deleted file mode 100644 index b32f86a..0000000 --- a/debian/patches/bash-completion.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix bash-completion installation. - /etc/bash_completion.d is deprecated. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1293 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/3075df896b37e5f77d1151c76b52aeda55b30869 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -209,7 +209,9 @@ export(PACKAGE PDAL) - - # TODO: move under scripts/bash-completion ? - if (WITH_COMPLETION) -- if (IS_DIRECTORY /etc/bash_completion.d) -+ if (IS_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions) -+ install(FILES "${PROJECT_SOURCE_DIR}/scripts/bash-completion/pdal" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/bash-completion/completions") -+ elseif (IS_DIRECTORY /etc/bash_completion.d) - install(FILES "${PROJECT_SOURCE_DIR}/scripts/bash-completion/pdal" DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d") - endif() - endif() diff --git a/debian/patches/cmake-3.6-hdf5.patch b/debian/patches/cmake-3.6-hdf5.patch deleted file mode 100644 index f676019..0000000 --- a/debian/patches/cmake-3.6-hdf5.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Fix HDF5 include directory with CMake >= 3.6.0. - HDF5_INCLUDE_DIR is deprecated some time ago, - only HDF5_INCLUDE_DIRS is set now. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1292 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/833f8af91a5ecfb245db839bca6775dbb40e4bf0 - ---- a/cmake/hdf5.cmake -+++ b/cmake/hdf5.cmake -@@ -5,6 +5,9 @@ - set (HDF5_FIND_COMPONENTS "CXX") - find_package(HDF5 COMPONENTS CXX REQUIRED) - if(HDF5_FOUND) -+ if(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR) -+ set(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS}) -+ endif() - include_directories(${HDF5_INCLUDE_DIR}) - add_definitions(-DHAVE_HDF5=1) - set(PDAL_HAVE_HDF5 1) diff --git a/debian/patches/series b/debian/patches/series index a3beb4c..ffd5b44 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,3 @@ privacy-breach.patch disable-sphinxcontrib-bibtex.patch use-mathjax-package.patch spelling-errors.patch -cmake-3.6-hdf5.patch -bash-completion.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
