This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdal.
commit 06f669c321f7197c5f5216bfc9939cee67251bbc Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Apr 3 20:41:28 2017 +0200 Drop kfreebsd.patch, applied upstream. Drop 0001-Add-include.-Should-fix-1484.patch, included upstream. --- debian/changelog | 2 ++ debian/patches/0001-Add-include.-Should-fix-1484.patch | 16 ---------------- debian/patches/kfreebsd.patch | 16 ---------------- debian/patches/series | 2 -- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7071d22..88e6a74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ pdal (1.5.0~rc1-1) UNRELEASED; urgency=medium * New upstream release candidate. * Update copyright years for Hobu, Inc & Bradley J Chambers. * Enable PIE hardening buildflags. + * Drop kfreebsd.patch, applied upstream. + * Drop 0001-Add-include.-Should-fix-1484.patch, included upstream. -- Bas Couwenberg <sebas...@debian.org> Mon, 03 Apr 2017 20:31:31 +0200 diff --git a/debian/patches/0001-Add-include.-Should-fix-1484.patch b/debian/patches/0001-Add-include.-Should-fix-1484.patch deleted file mode 100644 index 748a114..0000000 --- a/debian/patches/0001-Add-include.-Should-fix-1484.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Add include. Should fix #1484. -Author: Connor Manning <con...@hobu.co> -Origin: https://github.com/PDAL/PDAL/commit/5e04355d8516888e52eca20db7899dde7a29b573 -Bug: https://github.com/PDAL/PDAL/issues/1484 -Bug-Debian: https://bugs.debian.org/853607 - ---- a/vendor/arbiter/arbiter.hpp -+++ b/vendor/arbiter/arbiter.hpp -@@ -55,6 +55,7 @@ SOFTWARE. - #pragma once - - #include <condition_variable> -+#include <functional> - #include <map> - #include <memory> - #include <mutex> diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch deleted file mode 100644 index 650e105..0000000 --- a/debian/patches/kfreebsd.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Add support for GNU/kFreeBSD. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/PDAL/PDAL/pull/1447 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/20bff4543345b14c71c8df3364b73c616397a2d0 - ---- a/pdal/PluginManager.cpp -+++ b/pdal/PluginManager.cpp -@@ -60,7 +60,7 @@ static PluginManager s_instance; - - #if defined(__APPLE__) && defined(__MACH__) - const std::string dynamicLibraryExtension(".dylib"); --#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__GNU__) -+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__) - const std::string dynamicLibraryExtension(".so"); - #elif defined _WIN32 - const std::string dynamicLibraryExtension(".dll"); diff --git a/debian/patches/series b/debian/patches/series index 915b4f8..080f495 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ privacy-breach.patch disable-sphinxcontrib-bibtex.patch use-mathjax-package.patch -kfreebsd.patch -0001-Add-include.-Should-fix-1484.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.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