Bas Couwenberg pushed to branch master at Debian GIS Project / pyosmium
Commits: 3a1bcc18 by Bas Couwenberg at 2020-10-30T12:18:08+01:00 Update lintian overrides. - - - - - 52e3ad3e by Bas Couwenberg at 2020-10-30T12:31:18+01:00 Add patch to fix FTFBS with pybind11 2.6.0. - - - - - 2e98bf2b by Bas Couwenberg at 2020-10-30T12:42:56+01:00 Set distribution to unstable. - - - - - 4 changed files: - debian/changelog - + debian/patches/pybind11-2.6.0.patch - + debian/patches/series - − debian/source/lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +pyosmium (3.0.1-2) unstable; urgency=medium + + * Update lintian overrides. + * Add patch to fix FTFBS with pybind11 2.6.0. + + -- Bas Couwenberg <[email protected]> Fri, 30 Oct 2020 12:42:42 +0100 + pyosmium (3.0.1-1) unstable; urgency=medium * New upstream release. ===================================== debian/patches/pybind11-2.6.0.patch ===================================== @@ -0,0 +1,19 @@ +Description: Use CMAKE_CXX_STANDARD instead of PYBIND11_CPP_STANDARD. + See: https://github.com/pybind/pybind11/blob/v2.6.0/docs/upgrade.rst#cmake-support +Author: Bas Couwenberg <[email protected]> +Bug: https://github.com/osmcode/pyosmium/issues/147 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,9 +8,9 @@ include_directories(SYSTEM ${OSMIUM_INCL + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib) + + if(MSVC) +- set(PYBIND11_CPP_STANDARD /std:c++14) ++ set(CMAKE_CXX_STANDARD 14) + else() +- set(PYBIND11_CPP_STANDARD -std=c++11) ++ set(CMAKE_CXX_STANDARD 11) + endif() + + if(PYBIND11_PREFIX) ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +pybind11-2.6.0.patch ===================================== debian/source/lintian-overrides deleted ===================================== @@ -1,3 +0,0 @@ -# Not worth the effort -testsuite-autopkgtest-missing - View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/f85040dc448296223e67ab0a75cf75b7526b8be5...2e98bf2b51db02254867bada26206515eea2f059 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pyosmium/-/compare/f85040dc448296223e67ab0a75cf75b7526b8be5...2e98bf2b51db02254867bada26206515eea2f059 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
