This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdal.
commit 99fee664e21f9f3711d57ef8aef8b493a1b31e72 Author: Bas Couwenberg <[email protected]> Date: Sun Aug 28 16:21:25 2016 +0200 Add patch to fix bash-completion installation. --- debian/changelog | 1 + debian/control | 1 + debian/patches/bash-completion.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + debian/rules | 6 ------ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7640714..aa53ef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pdal (1.3.0~rc1-1~exp2) UNRELEASED; urgency=medium * Add patch to fix HDF5 include directory with CMake >= 3.6.0. + * Add patch to fix bash-completion installation. -- Bas Couwenberg <[email protected]> Sun, 28 Aug 2016 15:02:48 +0200 diff --git a/debian/control b/debian/control index 30fa31f..eb80c2a 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Bas Couwenberg <[email protected]> Build-Depends: debhelper (>= 9), dh-python, autotools-dev, + bash-completion, chrpath, cmake (>= 3.0), libboost-filesystem-dev, diff --git a/debian/patches/bash-completion.patch b/debian/patches/bash-completion.patch new file mode 100644 index 0000000..9b8b7b8 --- /dev/null +++ b/debian/patches/bash-completion.patch @@ -0,0 +1,18 @@ +Description: Fix bash-completion installation. + /etc/bash_completion.d is deprecated. +Author: Bas Couwenberg <[email protected]> +Forwarded: https://github.com/PDAL/PDAL/pull/1293 + +--- 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/series b/debian/patches/series index 51e05e7..a3beb4c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ disable-sphinxcontrib-bibtex.patch use-mathjax-package.patch spelling-errors.patch cmake-3.6-hdf5.patch +bash-completion.patch diff --git a/debian/rules b/debian/rules index 0d3bf08..630d5e0 100755 --- a/debian/rules +++ b/debian/rules @@ -63,12 +63,6 @@ override_dh_auto_test: override_dh_auto_install: dh_auto_install - # Fix bash-completion installation - mkdir -p debian/tmp/usr/share/bash-completion/completions - mv debian/tmp/usr/etc/bash_completion.d/pdal debian/tmp/usr/share/bash-completion/completions - rm -rf debian/tmp/usr/etc/bash_completion.d - rmdir debian/tmp/usr/etc/ - # Strip RPATH chrpath --delete debian/tmp/usr/lib/libpdal_plugin_*.so -- 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
