Johan Van de Wauw pushed to branch experimental at Debian GIS Project / saga
Commits:
c9ed1bb8 by Johan Van de Wauw at 2022-04-25T16:03:56+02:00
Change manfile license
- - - - -
cbc68295 by Johan Van de Wauw at 2022-04-25T16:41:40+02:00
First series of d/copyright additions
- - - - -
389ba3d2 by Johan Van de Wauw at 2022-04-25T20:01:31+02:00
Add python bindings again
- - - - -
1a6149f0 by Johan Van de Wauw at 2022-04-25T20:01:31+02:00
Use header files as installed by cmake
- - - - -
8 changed files:
- debian/control
- debian/copyright
- debian/libsaga-dev.install
- + debian/patches/python_fix.patch
- debian/patches/series
- + debian/python3-saga.install
- debian/rules
- debian/saga_cmd.pod
Changes:
=====================================
debian/control
=====================================
@@ -11,11 +11,13 @@ Build-Depends: cmake,
libgdal-dev,
libhpdf-dev,
libproj-dev,
+ libpython3-dev,
libqhull-dev,
libsvm-dev,
libvigraimpex-dev,
libwxgtk3.0-gtk3-dev,
- pkg-config
+ pkg-config,
+ swig
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git -b experimental
@@ -89,3 +91,17 @@ Description: SAGA GIS shared library (graphical models)
information system used for editing and analysing spatial data.
.
This package contains the library files for developing graphical modules.
+
+Package: python3-saga
+Architecture: any
+Section: python
+Depends: ${python3:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests: saga (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Description: SAGA GIS Python bindings
+ SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
+ information system used for editing and analysing spatial data.
+ .
+ This package contains the Python bindings to SAGA.
=====================================
debian/copyright
=====================================
@@ -66,6 +66,7 @@ License: CC0-1.0
Files: saga-gis/src/tools/climate/*
Copyright: 2011-2019, Olaf Conrad
+ DN Karger
License: GPL-2+
Files: saga-gis/src/tools/contrib/contrib_perego/*
@@ -107,6 +108,14 @@ Copyright: 2005, Victor Olaya
2005, Olaf Conrad
License: LGPL-2.1
+Files: saga-gis/src/tools/imagery/*
+Copyright: 2019, D.N.Karger
+ Olaf Conrad
+ 2016-2018, L.Landschreiber
+
+Files: saga-gis/src/tools/db/db_mysql/
+Copyright: 2009, Fergat Bingol
+
Files: saga-gis/src/tools/garden/*
Copyright: 2003-2018, Olaf Conrad
2006, Victor Olaya
@@ -156,6 +165,11 @@ Copyright: 2000-2005, Liam Girdwood
Comment: Contains code modified from libnova-0.12, grass
License: GPL-2+
+Files: saga-gis/src/tools/io/io_riegl_rdb/rapidjson/*
+Copyright: Copyright (C) 2011-2014 Milo Yip
+License: Expat
+
+
Files: saga-gis/src/tools/io/*
Copyright: 2003-2018, Olaf Conrad
2009-2014, Volker Wichmann
@@ -251,7 +265,7 @@ Copyright: 2003-2011, Olaf Conrad
License: GPL-2+
Files: debian/*
-Copyright: 2010-2014 Johan Van de Wauw <[email protected]>
+Copyright: 2010-2014 Johan Van de Wauw <[email protected]>
License: LGPL-2.1+
License: GPL-2
=====================================
debian/libsaga-dev.install
=====================================
@@ -1,4 +1,3 @@
-saga-gis/src/saga_core/saga_api/*.h /usr/include/saga_api/
-saga-gis/src/saga_core/saga_gdi/*.h /usr/include/saga_gdi/
+usr/include
usr/lib/*/libsaga_api.so
usr/lib/*/libsaga_gdi.so
=====================================
debian/patches/python_fix.patch
=====================================
@@ -0,0 +1,59 @@
+--- a/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
++++ b/saga-gis/src/saga_core/saga_api/saga_api_python/CMakeLists.txt
+@@ -25,13 +25,13 @@ set(SAGA_API_PUBLIC_HEADERS
+ find_package(SWIG QUIET)
+ if(SWIG_FOUND)
+ message(STATUS "SWIG for Python found")
+- find_package(PythonLibs QUIET)
+- if(PythonLibs_FOUND)
++ find_package(Python COMPONENTS Interpreter Development)
++ if(Python_FOUND)
+ # project(saga_api_python)
+
+ message(STATUS "project: ${PROJECT_NAME}")
+
+- message(STATUS "PythonLibs found")
++ message(STATUS "Python found")
+
+ if(POLICY CMP0078) # SWIG: use standard target name.
+ cmake_policy(SET CMP0078 NEW)
+@@ -43,8 +43,8 @@ if(SWIG_FOUND)
+
+ include(UseSWIG)
+
+- include_directories("${PYTHON_INCLUDE_PATH}")
+- include_directories("${PYTHON_INCLUDE_PATH}/../PC") # msvc
builds
++ include_directories("${Python_INCLUDE_DIRS}")
++ include_directories("${Python_INCLUDE_DIRS}/../PC") # msvc builds
+ include_directories("..")
+
+ set(CMAKE_SWIG_FLAGS "-D_SAGA_PYTHON -D_SWIG_WCHAR")
+@@ -57,22 +57,14 @@ if(SWIG_FOUND)
+ set_property(TARGET saga_api_python PROPERTY OUTPUT_NAME
saga_api)
+
+ swig_link_libraries(saga_api_python saga_api)
+- swig_link_libraries(saga_api_python ${PYTHON_LIBRARIES})
++ swig_link_libraries(saga_api_python ${Python_LIBRARIES})
+
+- if(MSVC)
+- set(PYTHON_SITE_PACKAGES
"${PYTHON_INCLUDE_PATH}/../Lib/site-packages")
+- else() #if(NOT MSVC)
+- execute_process(
+- COMMAND python -c "import site;
print(site.getsitepackages()[0])"
+- OUTPUT_VARIABLE PYTHON_SITE_PACKAGES
OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- endif()
+
+- if(EXISTS ${PYTHON_SITE_PACKAGES})
+- message(STATUS "Python site-packages:
${PYTHON_SITE_PACKAGES}")
+- install(TARGETS saga_api_python DESTINATION
${PYTHON_SITE_PACKAGES})
+- install(FILES
${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py
DESTINATION ${PYTHON_SITE_PACKAGES})
+- install(FILES
${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION
${PYTHON_SITE_PACKAGES})
++ if(EXISTS ${Python_SITELIB})
++ message(STATUS "Python site-packages: ${PYTHON_SITELIB}")
++ install(TARGETS saga_api_python DESTINATION ${Python_SITELIB})
++ install(FILES
${CMAKE_BINARY_DIR}/src/saga_core/saga_api/saga_api_python/saga_api.py
DESTINATION ${Python_SITELIB})
++ install(FILES
${CMAKE_SOURCE_DIR}/src/accessories/python/examples/saga_helper.py DESTINATION
${Python_SITELIB})
+ endif()
+ endif()
+ endif()
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
multiarch_cmake.patch
imagery_svm.patch
+python_fix.patch
=====================================
debian/python3-saga.install
=====================================
@@ -0,0 +1 @@
+usr/lib/python*
=====================================
debian/rules
=====================================
@@ -32,6 +32,3 @@ override_dh_auto_install:
# Remove executable bit from resource files
chmod -x debian/*/usr/share/saga/*.*
-
- # Explicitly remove files not to be installed
- $(RM) -r $(CURDIR)/debian/tmp/usr/include
=====================================
debian/saga_cmd.pod
=====================================
@@ -106,7 +106,7 @@ On the website of I<http://www.saga-gis.org>, a list of
known bugs can be found
=head1 AUTHORS
B<SAGA> was written by Olaf Conrad with help from a large number of
contributors. This manual page was written by Johan Van de Wauw.
-Both are released under the GNU General Public License v2.
+This manual is released under the GNU Lesser General Public License v2.1. The
SAGA API uses the same license, however most of SAGA itself uses the GNU Public
License 2 or higher.
More info I<http://www.saga-gis.org>
View it on GitLab:
https://salsa.debian.org/debian-gis-team/saga/-/compare/daa64a19c4a43f33b54d0a083df305cc6f5bebda...1a6149f0048a8e57cdde2545be7095eea89daabe
--
View it on GitLab:
https://salsa.debian.org/debian-gis-team/saga/-/compare/daa64a19c4a43f33b54d0a083df305cc6f5bebda...1a6149f0048a8e57cdde2545be7095eea89daabe
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
