[Git][debian-gis-team/pdal][master] 5 commits: New upstream version 1.9~rc3+ds
Bas Couwenberg
gitlab at salsa.debian.org
Fri Apr 5 20:01:52 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / pdal
Commits:
88d96a54 by Bas Couwenberg at 2019-04-05T18:28:40Z
New upstream version 1.9~rc3+ds
- - - - -
e35afe34 by Bas Couwenberg at 2019-04-05T18:31:30Z
Merge tag 'upstream/1.9_rc3+ds'
Upstream version 1.9~rc3+ds
- - - - -
2364c32a by Bas Couwenberg at 2019-04-05T18:32:03Z
New upstream release candidate.
- - - - -
347791c4 by Bas Couwenberg at 2019-04-05T18:33:21Z
Drop cmake-python3-numpy.patch, applied upstream.
- - - - -
bc500b29 by Bas Couwenberg at 2019-04-05T18:34:47Z
Set distribution to experimental.
- - - - -
4 changed files:
- cmake/python.cmake
- debian/changelog
- − debian/patches/cmake-python3-numpy.patch
- debian/patches/series
Changes:
=====================================
cmake/python.cmake
=====================================
@@ -4,8 +4,10 @@
#
# Version 3.12 has shiny new FindPython2 and FindPython3 scripts
+# Version 3.14 introduces direct support for NumPy.
+# When we require newer cmake versions, ditch the older support.
#
-if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
+if (NOT (CMAKE_VERSION VERSION_LESS "3.14.0"))
find_package(Python3 COMPONENTS Interpreter Development NumPy)
if (NOT Python3_FOUND)
find_package(Python2 2.7 REQUIRED EXACT
@@ -13,18 +15,40 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
# Since we've required 2.7, these should all be valid
set(PYTHON_LIBRARY ${Python2_LIBRARIES}
- CACHE FILEPATH "Python library")
+ CACHE FILEPATH "Python library")
set(PYTHON_INCLUDE_DIR ${Python2_INCLUDE_DIRS}
CACHE PATH "Location of Python include files")
set(PYTHON_NUMPY_INCLUDE_DIR ${Python2_NumPy_INCLUDE_DIRS}
CACHE PATH "Location of NumPy include files.")
else()
set(PYTHON_LIBRARY ${Python3_LIBRARIES}
- CACHE FILEPATH "Python library")
+ CACHE FILEPATH "Python library")
set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
- CACHE PATH "Location of Python include files.")
+ CACHE PATH "Location of Python include files.")
set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS}
- CACHE PATH "Location of NumPy include files.")
+ CACHE PATH "Location of NumPy include files.")
+ endif()
+ set(PDAL_HAVE_PYTHON 1)
+elseif (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
+ find_package(Python3 COMPONENTS Interpreter Development)
+ if (NOT Python3_FOUND)
+ find_package(Python2 2.7 REQUIRED EXACT
+ COMPONENTS Interpreter Development)
+
+ # Since we've required 2.7, these should all be valid
+ set(PYTHON_LIBRARY ${Python2_LIBRARIES}
+ CACHE FILEPATH "Python library")
+ set(PYTHON_INCLUDE_DIR ${Python2_INCLUDE_DIRS}
+ CACHE PATH "Location of Python include files")
+ set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
+ find_package(NumPy 1.5 REQUIRED)
+ else()
+ set(PYTHON_LIBRARY ${Python3_LIBRARIES}
+ CACHE FILEPATH "Python library")
+ set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
+ CACHE PATH "Location of Python include files.")
+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+ find_package(NumPy 1.5 REQUIRED)
endif()
set(PDAL_HAVE_PYTHON 1)
else()
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+pdal (1.9~rc3+ds-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Drop cmake-python3-numpy.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 05 Apr 2019 20:34:26 +0200
+
pdal (1.9~rc2+ds-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/patches/cmake-python3-numpy.patch deleted
=====================================
@@ -1,37 +0,0 @@
-Description: Don't find Numpy component of Python{2,3}.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/PDAL/PDAL/issues/2444
-
---- a/cmake/python.cmake
-+++ b/cmake/python.cmake
-@@ -6,10 +6,10 @@
- # Version 3.12 has shiny new FindPython2 and FindPython3 scripts
- #
- if (NOT (CMAKE_VERSION VERSION_LESS "3.12.0"))
-- find_package(Python3 COMPONENTS Interpreter Development NumPy)
-+ find_package(Python3 COMPONENTS Interpreter Development)
- if (NOT Python3_FOUND)
- find_package(Python2 2.7 REQUIRED EXACT
-- COMPONENTS Interpreter Development NumPy)
-+ COMPONENTS Interpreter Development)
-
- # Since we've required 2.7, these should all be valid
- set(PYTHON_LIBRARY ${Python2_LIBRARIES}
-@@ -18,13 +18,15 @@ if (NOT (CMAKE_VERSION VERSION_LESS "3.1
- CACHE PATH "Location of Python include files")
- set(PYTHON_NUMPY_INCLUDE_DIR ${Python2_NumPy_INCLUDE_DIRS}
- CACHE PATH "Location of NumPy include files.")
-+ set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
-+ find_package(NumPy 1.5 REQUIRED)
- else()
- set(PYTHON_LIBRARY ${Python3_LIBRARIES}
- CACHE FILEPATH "Python library")
- set(PYTHON_INCLUDE_DIR ${Python3_INCLUDE_DIRS}
- CACHE PATH "Location of Python include files.")
-- set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS}
-- CACHE PATH "Location of NumPy include files.")
-+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
-+ find_package(NumPy 1.5 REQUIRED)
- endif()
- set(PDAL_HAVE_PYTHON 1)
- else()
=====================================
debian/patches/series
=====================================
@@ -2,4 +2,3 @@ privacy-breach.patch
disable-sphinxcontrib-bibtex.patch
use-mathjax-package.patch
sphinx-DOCUMENTATION_OPTIONS-does-not-define-SOURCELINK_SUFFIX.patch
-cmake-python3-numpy.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/compare/6afadcccbc260345a8372a0defbba6f344416005...bc500b29a219a55512456c595c70a923f38abc0a
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/compare/6afadcccbc260345a8372a0defbba6f344416005...bc500b29a219a55512456c595c70a923f38abc0a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190405/201b7553/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list