[Git][debian-gis-team/saga][experimental] 7 commits: Remove obsolete patches
Johan Van de Wauw (@johanvdw-guest)
gitlab at salsa.debian.org
Thu Apr 14 08:16:49 BST 2022
Johan Van de Wauw pushed to branch experimental at Debian GIS Project / saga
Commits:
df901d02 by Johan Van de Wauw at 2022-04-13T21:02:22+02:00
Remove obsolete patches
- - - - -
c7052877 by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Make libfire optional in cmake
- - - - -
4cfc9fe8 by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Mark patch as applied upstream
- - - - -
89e44b10 by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Use multiarch paths
- - - - -
fa1ed8c9 by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Adjust lib-install-files
- - - - -
fe971caf by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Disable python bindings for now
- - - - -
277d0722 by Johan Van de Wauw at 2022-04-13T21:02:31+02:00
Temporary disable svm and libdxf tools
- - - - -
17 changed files:
- debian/control
- debian/control.in
- − debian/libsaga-api-8.0.1.install
- + debian/libsaga-api-8.2.0.install
- debian/libsaga-api-8.0.1.lintian-overrides → debian/libsaga-api-8.2.0.lintian-overrides
- − debian/libsaga-gdi-8.0.1.install
- + debian/libsaga-gdi-8.2.0.install
- debian/libsaga-gdi-8.0.1.lintian-overrides → debian/libsaga-gdi-8.2.0.lintian-overrides
- + debian/patches/disable_fire_spreading.patch
- + debian/patches/disable_tools.patch
- − debian/patches/dxflib_configure.patch
- − debian/patches/fix-version-check.patch
- + debian/patches/multiarch_cmake.patch
- debian/patches/series
- debian/patches/spelling-errors.patch
- − debian/python3-saga.install
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -4,7 +4,8 @@ Uploaders: Johan Van de Wauw <johan at vandewauw.be>,
Francesco Paolo Lovergine <frankie at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: cmake,
+ debhelper-compat (= 12),
dh-python,
libdxflib-dev,
libexpat-dev,
@@ -91,17 +92,3 @@ 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/control.in
=====================================
@@ -4,7 +4,8 @@ Uploaders: Johan Van de Wauw <johan at vandewauw.be>,
Francesco Paolo Lovergine <frankie at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: cmake,
+ debhelper-compat (= 12),
dh-python,
libdxflib-dev,
libexpat-dev,
@@ -91,17 +92,3 @@ 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/libsaga-api-8.0.1.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/*/libsaga_api-*.so
=====================================
debian/libsaga-api-8.2.0.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/*/libsaga_api.so.8.2.0
+usr/lib/*/libsaga_api.so.8
=====================================
debian/libsaga-api-8.0.1.lintian-overrides → debian/libsaga-api-8.2.0.lintian-overrides
=====================================
=====================================
debian/libsaga-gdi-8.0.1.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/*/libsaga_gdi-*.so
=====================================
debian/libsaga-gdi-8.2.0.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/*/libsaga_gdi.so.8.2.0
+usr/lib/*/libsaga_gdi.so.8
=====================================
debian/libsaga-gdi-8.0.1.lintian-overrides → debian/libsaga-gdi-8.2.0.lintian-overrides
=====================================
=====================================
debian/patches/disable_fire_spreading.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Allow disabling libfire build (non-free license)
+Author: Johan Van de Wauw <johan at gisky.be>
+Forwarded: https://sourceforge.net/p/saga-gis/code/merge-requests/21/
+
+--- a/saga-gis/src/tools/simulation/sim_fire_spreading/CMakeLists.txt
++++ b/saga-gis/src/tools/simulation/sim_fire_spreading/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-if(WITH_TOOLS)
++option(WITH_FIRE_SPREADING "Enable fire spreading tool (license requirements libfire)" ON)
++
++if(WITH_TOOLS AND WITH_FIRE_SPREADING)
+ project(sim_fire_spreading)
+
+ file(GLOB SAGA_TOOL_BLACKLIST # blacklist some unused files
=====================================
debian/patches/disable_tools.patch
=====================================
@@ -0,0 +1,31 @@
+--- a/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
++++ b/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ option(WITH_SYSTEM_DXF "Check to use system version of dxflib library instead of embedded copy" OFF)
++option(WITH_DXF "Build dxflib tools" ON)
+
+-if(WITH_TOOLS)
++if(WITH_TOOLS AND WITH_DXF)
+ project(io_shapes_dxf)
+
+ if(WITH_SYSTEM_DXF)
+--- a/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
++++ b/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ option(WITH_SYSTEM_SVM "Check to use system version of libsvm instead of embedded copy" OFF)
++option(WITH_SVM "Build SVM module" ON)
+
+-if(WITH_TOOLS)
++if(WITH_TOOLS AND WITH_SVM)
+ project(imagery_svm)
+
+ if(WITH_SYSTEM_SVM)
+@@ -13,7 +14,7 @@ if(WITH_TOOLS)
+ endif()
+
+ include(../../CMakePluginTemplate.cmake) # load common tool template
+-
++
+ if(SVM_FOUND)
+ target_include_directories(${PROJECT_NAME} PRIVATE ${SVM_INCLUDE})
+ target_link_libraries (${PROJECT_NAME} ${SVM_LIBRARY})
=====================================
debian/patches/dxflib_configure.patch deleted
=====================================
@@ -1,41 +0,0 @@
-Description: Fix libdxf handling
-Author: Johan Van de Wauw <johan at gisky.be>
-Forwarded: https://sourceforge.net/p/saga-gis/code/merge-requests/12/
-Last-Update: 2019-07-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/saga-gis/configure.ac
-+++ b/saga-gis/configure.ac
-@@ -340,13 +340,27 @@ if test "x$use_libfire" != xyes; then
- AC_MSG_RESULT([ Libfire disabled])
- fi
-
--
--AC_ARG_WITH(system_dxflib,
-+# check for --with-system_dxflib
-+AC_ARG_WITH([system_dxflib],
- AS_HELP_STRING([--with-system-dxflib],[Use system version of dxflib instead of embedded copy, requires this library (and the header files)]),
-- AC_MSG_RESULT([ using system libdxf]),
-- system_libdxf=true,system_libdxf=false
-+ system_dxflib=true,
- )
--AM_CONDITIONAL(SYSTEM_DXFLIB, [test "$LIBDXFFOUND" -eq 1 -a x$system_libdxf = xtrue])
-+
-+AC_MSG_CHECKING([usage of system libdxflib])
-+
-+if test "$with_system_dxflib" = yes ; then
-+ if test "$LIBDXFFOUND" = 1 ; then
-+ AC_MSG_RESULT([yes])
-+ SYSTEM_DXFLIB=yes
-+ else
-+ AC_MSG_FAILURE([--with-system-svm was given but test for libsvm failed])
-+ fi
-+else
-+ SYSTEM_DXFLIB=no
-+ AC_MSG_RESULT([no])
-+fi
-+
-+AM_CONDITIONAL([SYSTEM_DXFLIB], [test x$SYSTEM_DXFLIB = xyes])
-
- # check for --with-system-svm
- AC_ARG_WITH([system_svm],
=====================================
debian/patches/fix-version-check.patch deleted
=====================================
@@ -1,68 +0,0 @@
-Description: Fix wxwidgets version check
-Author: Johan Van de Wauw <johan at gisky.be>
-Forwarded: https://sourceforge.net/p/saga-gis/code/merge-requests/19/
-Last-Update: 2021-12-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3
---- a/saga-gis/src/saga_core/saga_gui/active_attributes_control.cpp
-+++ b/saga-gis/src/saga_core/saga_gui/active_attributes_control.cpp
-@@ -132,7 +132,7 @@ CActive_Attributes_Control::CActive_Attr
- pRenderer->DecRef();
- pRenderer->SetParameters("-1,-1,g"); // Use the shorter of e or f (g)
-
--#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- pRenderer = GetDefaultRendererForType(wxGRID_VALUE_DATE );
- pRenderer->DecRef();
- pRenderer->SetParameters("%Y-%m-%d");
---- a/saga-gis/src/saga_core/saga_gui/dlg_table_control.cpp
-+++ b/saga-gis/src/saga_core/saga_gui/dlg_table_control.cpp
-@@ -72,7 +72,7 @@ IMPLEMENT_CLASS(CDLG_Table_Control, wxGr
-
- //---------------------------------------------------------
- BEGIN_EVENT_TABLE(CDLG_Table_Control, wxGrid)
--#if (wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+#if (wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- EVT_GRID_RANGE_SELECT (CDLG_Table_Control::On_Selected ) // RANGE_SELECT was split in RANGE_SELECTING and SELECTED in 3.2
- #else
- EVT_GRID_RANGE_SELECTED (CDLG_Table_Control::On_Selected )
-@@ -142,7 +142,7 @@ CDLG_Table_Control::CDLG_Table_Control(w
- pRenderer->DecRef();
- pRenderer->SetParameters("-1,-1,g"); // Use the shorter of e or f (g)
-
--#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- pRenderer = GetDefaultRendererForType(wxGRID_VALUE_DATE );
- pRenderer->DecRef();
- pRenderer->SetParameters("%Y-%m-%d");
---- a/saga-gis/src/saga_core/saga_gui/view_table_control.cpp
-+++ b/saga-gis/src/saga_core/saga_gui/view_table_control.cpp
-@@ -72,7 +72,7 @@ IMPLEMENT_CLASS(CVIEW_Table_Control, wxG
-
- //---------------------------------------------------------
- BEGIN_EVENT_TABLE(CVIEW_Table_Control, wxGrid)
--#if (wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+#if (wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- EVT_GRID_RANGE_SELECT (CVIEW_Table_Control::On_Selected ) // RANGE_SELECT was split in RANGE_SELECTING and SELECTED in 3.2
- #else
- EVT_GRID_RANGE_SELECTING (CVIEW_Table_Control::On_Selecting )
-@@ -155,7 +155,7 @@ CVIEW_Table_Control::CVIEW_Table_Control
- pRenderer->DecRef();
- pRenderer->SetParameters("-1,-1,g"); // Use the shorter of e or f (g)
-
--#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+#if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- pRenderer = GetDefaultRendererForType(wxGRID_VALUE_DATE );
- pRenderer->DecRef();
- pRenderer->SetParameters("%Y-%m-%d");
---- a/saga-gis/src/saga_core/saga_gui/view_table_data.h
-+++ b/saga-gis/src/saga_core/saga_gui/view_table_data.h
-@@ -193,7 +193,7 @@ public:
-
- case SG_DATATYPE_Color : return( wxGRID_VALUE_STRING );
-
-- #if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1 && wxRELEASE_NUMBER < 5)
-+ #if !(wxMAJOR_VERSION == 3 && wxMINOR_VERSION <= 1)
- case SG_DATATYPE_Date : return( wxGRID_VALUE_DATE );
- #endif
-
=====================================
debian/patches/multiarch_cmake.patch
=====================================
@@ -0,0 +1,439 @@
+--- a/saga-gis/src/saga_core/saga_api/CMakeLists.txt
++++ b/saga-gis/src/saga_core/saga_api/CMakeLists.txt
+@@ -163,7 +163,7 @@ set_target_properties(saga_api PROPERTIE
+ )
+
+ # where to install the library
+-install(TARGETS saga_api DESTINATION lib)
++install(TARGETS saga_api DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${SAGA_API_PUBLIC_HEADERS} DESTINATION include/saga/saga_api)
+
+ if(MSVC)
+--- a/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt
++++ b/saga-gis/src/saga_core/saga_gdi/CMakeLists.txt
+@@ -64,7 +64,7 @@ set_target_properties(saga_gdi PROPERTIE
+ SOVERSION ${SAGA_VERSION_MAJOR})
+
+ # where to install the binary
+-install(TARGETS saga_gdi DESTINATION lib)
++install(TARGETS saga_gdi DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install(FILES ${SAGA_GDI_PUBLIC_HEADERS} DESTINATION include/saga/saga_gdi)
+
+ if(MSVC)
+--- a/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt
++++ b/saga-gis/src/accessories/templates/template4saga-tools/my_tool_library/CMakeLists.txt
+@@ -72,4 +72,4 @@ else() # if(NOT MSVC) # expect g++ on Li
+ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS -fPIC)
+ endif()
+
+-install(TARGETS ${PROJECT_NAME} DESTINATION lib/saga)
++install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/saga)
+--- a/saga-gis/src/tools/CMakePluginTemplate.cmake
++++ b/saga-gis/src/tools/CMakePluginTemplate.cmake
+@@ -40,7 +40,7 @@ target_compile_definitions(${PROJECT_NAM
+ # link saga_api
+ target_link_libraries(${PROJECT_NAME} saga_api)
+
+-install(TARGETS ${PROJECT_NAME} DESTINATION lib/saga)
++install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/saga)
+
+ # reset variables
+ set(SAGA_TOOL_CUSTOM_SOURCE_LIST)
+--- a/saga-gis/CMakeLists.txt
++++ b/saga-gis/CMakeLists.txt
+@@ -53,6 +53,9 @@ include(shared_cmake/scripts/require-cpp
+ include(shared_cmake/scripts/enable_warnings.cmake)
+ include(shared_cmake/scripts/windows_version_info.cmake)
+
++# Use GNU install dirs to support multiarch
++include(cmake/modules/GNUInstallDirs.cmake)
++
+ # create windows resouce file
+ set(windows_version_rc "${CMAKE_BINARY_DIR}/win_version_info.rc")
+ gen_win_version_resource("${PROJECT_NAME}" "${windows_version_rc}"
+--- /dev/null
++++ b/saga-gis/cmake/modules/GNUInstallDirs.cmake
+@@ -0,0 +1,383 @@
++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
++# file Copyright.txt or https://cmake.org/licensing for details.
++
++#[=======================================================================[.rst:
++GNUInstallDirs
++--------------
++
++Define GNU standard installation directories
++
++Provides install directory variables as defined by the
++`GNU Coding Standards`_.
++
++.. _`GNU Coding Standards`: https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
++
++Result Variables
++^^^^^^^^^^^^^^^^
++
++Inclusion of this module defines the following variables:
++
++``CMAKE_INSTALL_<dir>``
++
++ Destination for files of a given type. This value may be passed to
++ the ``DESTINATION`` options of :command:`install` commands for the
++ corresponding file type.
++
++``CMAKE_INSTALL_FULL_<dir>``
++
++ The absolute path generated from the corresponding ``CMAKE_INSTALL_<dir>``
++ value. If the value is not already an absolute path, an absolute path
++ is constructed typically by prepending the value of the
++ :variable:`CMAKE_INSTALL_PREFIX` variable. However, there are some
++ `special cases`_ as documented below.
++
++where ``<dir>`` is one of:
++
++``BINDIR``
++ user executables (``bin``)
++``SBINDIR``
++ system admin executables (``sbin``)
++``LIBEXECDIR``
++ program executables (``libexec``)
++``SYSCONFDIR``
++ read-only single-machine data (``etc``)
++``SHAREDSTATEDIR``
++ modifiable architecture-independent data (``com``)
++``LOCALSTATEDIR``
++ modifiable single-machine data (``var``)
++``RUNSTATEDIR``
++ run-time variable data (``LOCALSTATEDIR/run``)
++``LIBDIR``
++ object code libraries (``lib`` or ``lib64``
++ or ``lib/<multiarch-tuple>`` on Debian)
++``INCLUDEDIR``
++ C header files (``include``)
++``OLDINCLUDEDIR``
++ C header files for non-gcc (``/usr/include``)
++``DATAROOTDIR``
++ read-only architecture-independent data root (``share``)
++``DATADIR``
++ read-only architecture-independent data (``DATAROOTDIR``)
++``INFODIR``
++ info documentation (``DATAROOTDIR/info``)
++``LOCALEDIR``
++ locale-dependent data (``DATAROOTDIR/locale``)
++``MANDIR``
++ man documentation (``DATAROOTDIR/man``)
++``DOCDIR``
++ documentation root (``DATAROOTDIR/doc/PROJECT_NAME``)
++
++If the includer does not define a value the above-shown default will be
++used and the value will appear in the cache for editing by the user.
++
++Special Cases
++^^^^^^^^^^^^^
++
++The following values of :variable:`CMAKE_INSTALL_PREFIX` are special:
++
++``/``
++
++ For ``<dir>`` other than the ``SYSCONFDIR``, ``LOCALSTATEDIR`` and
++ ``RUNSTATEDIR``, the value of ``CMAKE_INSTALL_<dir>`` is prefixed
++ with ``usr/`` if it is not user-specified as an absolute path.
++ For example, the ``INCLUDEDIR`` value ``include`` becomes ``usr/include``.
++ This is required by the `GNU Coding Standards`_, which state:
++
++ When building the complete GNU system, the prefix will be empty
++ and ``/usr`` will be a symbolic link to ``/``.
++
++``/usr``
++
++ For ``<dir>`` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or
++ ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_<dir>`` is computed by
++ prepending just ``/`` to the value of ``CMAKE_INSTALL_<dir>``
++ if it is not user-specified as an absolute path.
++ For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc``.
++ This is required by the `GNU Coding Standards`_.
++
++``/opt/...``
++
++ For ``<dir>`` equal to ``SYSCONFDIR``, ``LOCALSTATEDIR`` or
++ ``RUNSTATEDIR``, the ``CMAKE_INSTALL_FULL_<dir>`` is computed by
++ *appending* the prefix to the value of ``CMAKE_INSTALL_<dir>``
++ if it is not user-specified as an absolute path.
++ For example, the ``SYSCONFDIR`` value ``etc`` becomes ``/etc/opt/...``.
++ This is defined by the `Filesystem Hierarchy Standard`_.
++
++.. _`Filesystem Hierarchy Standard`: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/index.html
++
++Macros
++^^^^^^
++
++.. command:: GNUInstallDirs_get_absolute_install_dir
++
++ ::
++
++ GNUInstallDirs_get_absolute_install_dir(absvar var)
++
++ Set the given variable ``absvar`` to the absolute path contained
++ within the variable ``var``. This is to allow the computation of an
++ absolute path, accounting for all the special cases documented
++ above. While this macro is used to compute the various
++ ``CMAKE_INSTALL_FULL_<dir>`` variables, it is exposed publicly to
++ allow users who create additional path variables to also compute
++ absolute paths where necessary, using the same logic.
++#]=======================================================================]
++
++cmake_policy(PUSH)
++cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
++
++# Convert a cache variable to PATH type
++
++macro(_GNUInstallDirs_cache_convert_to_path var description)
++ get_property(_GNUInstallDirs_cache_type CACHE ${var} PROPERTY TYPE)
++ if(_GNUInstallDirs_cache_type STREQUAL "UNINITIALIZED")
++ file(TO_CMAKE_PATH "${${var}}" _GNUInstallDirs_cmakepath)
++ set_property(CACHE ${var} PROPERTY TYPE PATH)
++ set_property(CACHE ${var} PROPERTY VALUE "${_GNUInstallDirs_cmakepath}")
++ set_property(CACHE ${var} PROPERTY HELPSTRING "${description}")
++ unset(_GNUInstallDirs_cmakepath)
++ endif()
++ unset(_GNUInstallDirs_cache_type)
++endmacro()
++
++# Create a cache variable with default for a path.
++macro(_GNUInstallDirs_cache_path var default description)
++ if(NOT DEFINED ${var})
++ set(${var} "${default}" CACHE PATH "${description}")
++ endif()
++ _GNUInstallDirs_cache_convert_to_path("${var}" "${description}")
++endmacro()
++
++# Create a cache variable with not default for a path, with a fallback
++# when unset; used for entries slaved to other entries such as
++# DATAROOTDIR.
++macro(_GNUInstallDirs_cache_path_fallback var default description)
++ if(NOT ${var})
++ set(${var} "" CACHE PATH "${description}")
++ set(${var} "${default}")
++ endif()
++ _GNUInstallDirs_cache_convert_to_path("${var}" "${description}")
++endmacro()
++
++# Installation directories
++#
++
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin"
++ "User executables (bin)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin"
++ "System admin executables (sbin)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec"
++ "Program executables (libexec)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc"
++ "Read-only single-machine data (etc)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_SHAREDSTATEDIR "com"
++ "Modifiable architecture-independent data (com)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_LOCALSTATEDIR "var"
++ "Modifiable single-machine data (var)")
++
++# We check if the variable was manually set and not cached, in order to
++# allow projects to set the values as normal variables before including
++# GNUInstallDirs to avoid having the entries cached or user-editable. It
++# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the
++# other cases.
++# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the
++# variable is a normal one, otherwise it is a cache one.
++get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET)
++if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
++ AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
++ AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}"))
++ # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed.
++ # Otherwise:
++ # * if _libdir_set is false it is not executed (meaning that it is
++ # not a cache variable)
++ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is
++ # not executed
++ # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and
++ # CMAKE_INSTALL_PREFIX are the same string it is not executed.
++ # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the
++ # execution, of this part of code, therefore at the next inclusion
++ # of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings
++ # are equal, meaning that the if is not executed the code the
++ # second time.
++
++ set(_LIBDIR_DEFAULT "lib")
++ # Override this default 'lib' with 'lib64' iff:
++ # - we are on Linux system but NOT cross-compiling
++ # - we are NOT on debian
++ # - we are on a 64 bits system
++ # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
++ # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
++ # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
++ # and CMAKE_INSTALL_PREFIX is "/usr"
++ # See http://wiki.debian.org/Multiarch
++ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
++ set(__LAST_LIBDIR_DEFAULT "lib")
++ # __LAST_LIBDIR_DEFAULT is the default value that we compute from
++ # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for
++ # the value that was last used as the default.
++ # This value is used to figure out whether the user changed the
++ # CMAKE_INSTALL_LIBDIR value manually, or if the value was the
++ # default one. When CMAKE_INSTALL_PREFIX changes, the value is
++ # updated to the new default, unless the user explicitly changed it..
++ endif()
++ if (NOT DEFINED CMAKE_SYSTEM_NAME OR NOT DEFINED CMAKE_SIZEOF_VOID_P)
++ message(AUTHOR_WARNING
++ "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
++ "Please enable at least one language before including GNUInstallDirs.")
++ endif()
++ if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
++ AND NOT CMAKE_CROSSCOMPILING
++ AND NOT EXISTS "/etc/arch-release")
++ if (EXISTS "/etc/debian_version") # is this a debian system ?
++ if(CMAKE_LIBRARY_ARCHITECTURE)
++ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
++ set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
++ endif()
++ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
++ AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
++ set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
++ endif()
++ endif()
++ else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
++ if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
++ set(_LIBDIR_DEFAULT "lib64")
++ if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
++ set(__LAST_LIBDIR_DEFAULT "lib64")
++ endif()
++ endif()
++ endif()
++ endif()
++ if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
++ set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
++ elseif(DEFINED __LAST_LIBDIR_DEFAULT
++ AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}")
++ set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}")
++ endif()
++endif()
++_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)")
++
++# Save for next run
++set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run")
++unset(_libdir_set)
++unset(__LAST_LIBDIR_DEFAULT)
++
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include"
++ "C header files (include)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include"
++ "C header files for non-gcc (/usr/include)")
++_GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
++ "Read-only architecture-independent data root (share)")
++
++#-----------------------------------------------------------------------------
++# Values whose defaults are relative to DATAROOTDIR. Store empty values in
++# the cache and store the defaults in local variables if the cache values are
++# not set explicitly. This auto-updates the defaults as DATAROOTDIR changes.
++
++_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
++ "Read-only architecture-independent data (DATAROOTDIR)")
++
++if(CMAKE_SYSTEM_NAME MATCHES "^(([^kF].*)?BSD|DragonFly)$")
++ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
++ "Info documentation (info)")
++else()
++ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info"
++ "Info documentation (DATAROOTDIR/info)")
++endif()
++
++if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
++ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
++ "Man documentation (man)")
++else()
++ _GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man"
++ "Man documentation (DATAROOTDIR/man)")
++endif()
++
++_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale"
++ "Locale-dependent data (DATAROOTDIR/locale)")
++_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}"
++ "Documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
++
++_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_RUNSTATEDIR "${CMAKE_INSTALL_LOCALSTATEDIR}/run"
++ "Run-time variable data (LOCALSTATEDIR/run)")
++
++#-----------------------------------------------------------------------------
++
++mark_as_advanced(
++ CMAKE_INSTALL_BINDIR
++ CMAKE_INSTALL_SBINDIR
++ CMAKE_INSTALL_LIBEXECDIR
++ CMAKE_INSTALL_SYSCONFDIR
++ CMAKE_INSTALL_SHAREDSTATEDIR
++ CMAKE_INSTALL_LOCALSTATEDIR
++ CMAKE_INSTALL_RUNSTATEDIR
++ CMAKE_INSTALL_LIBDIR
++ CMAKE_INSTALL_INCLUDEDIR
++ CMAKE_INSTALL_OLDINCLUDEDIR
++ CMAKE_INSTALL_DATAROOTDIR
++ CMAKE_INSTALL_DATADIR
++ CMAKE_INSTALL_INFODIR
++ CMAKE_INSTALL_LOCALEDIR
++ CMAKE_INSTALL_MANDIR
++ CMAKE_INSTALL_DOCDIR
++ )
++
++macro(GNUInstallDirs_get_absolute_install_dir absvar var)
++ if(NOT IS_ABSOLUTE "${${var}}")
++ # Handle special cases:
++ # - CMAKE_INSTALL_PREFIX == /
++ # - CMAKE_INSTALL_PREFIX == /usr
++ # - CMAKE_INSTALL_PREFIX == /opt/...
++ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/")
++ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
++ set(${absvar} "/${${var}}")
++ else()
++ if (NOT "${${var}}" MATCHES "^usr/")
++ set(${var} "usr/${${var}}")
++ endif()
++ set(${absvar} "/${${var}}")
++ endif()
++ elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
++ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
++ set(${absvar} "/${${var}}")
++ else()
++ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
++ endif()
++ elseif("${CMAKE_INSTALL_PREFIX}" MATCHES "^/opt/.*")
++ if("${dir}" STREQUAL "SYSCONFDIR" OR "${dir}" STREQUAL "LOCALSTATEDIR" OR "${dir}" STREQUAL "RUNSTATEDIR")
++ set(${absvar} "/${${var}}${CMAKE_INSTALL_PREFIX}")
++ else()
++ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
++ endif()
++ else()
++ set(${absvar} "${CMAKE_INSTALL_PREFIX}/${${var}}")
++ endif()
++ else()
++ set(${absvar} "${${var}}")
++ endif()
++endmacro()
++
++# Result directories
++#
++foreach(dir
++ BINDIR
++ SBINDIR
++ LIBEXECDIR
++ SYSCONFDIR
++ SHAREDSTATEDIR
++ LOCALSTATEDIR
++ RUNSTATEDIR
++ LIBDIR
++ INCLUDEDIR
++ OLDINCLUDEDIR
++ DATAROOTDIR
++ DATADIR
++ INFODIR
++ LOCALEDIR
++ MANDIR
++ DOCDIR
++ )
++ GNUInstallDirs_get_absolute_install_dir(CMAKE_INSTALL_FULL_${dir} CMAKE_INSTALL_${dir})
++endforeach()
++
++cmake_policy(POP)
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
-fix-version-check.patch
-dxflib_configure.patch
spelling-errors.patch
+disable_fire_spreading.patch
+multiarch_cmake.patch
+disable_tools.patch
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -8,6 +8,7 @@ Description: Fix spelling errors.
* minimun -> minimum
* maximun -> maximum
Author: Bas Couwenberg <sebastic at debian.org>
+Applied-Upstream: https://sourceforge.net/p/saga-gis/code/merge-requests/22/
--- a/saga-gis/src/tools/climate/climate_tools/snow_cover.cpp
+++ b/saga-gis/src/tools/climate/climate_tools/snow_cover.cpp
=====================================
debian/python3-saga.install deleted
=====================================
@@ -1 +0,0 @@
-usr/lib/python*
=====================================
debian/rules
=====================================
@@ -25,6 +25,9 @@ override_dh_auto_configure: templates
-DWITH_SYSTEM_SVM=on \
-DWITH_SYSTEM_DXF=on \
-DWITH_TRIANGLE=off \
+ -DWITH_FIRE_SPREADING=off \
+ -DWITH_DXF=off \
+ -DWITH_SVM=off
override_dh_auto_build:
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/28a752ba35fca532e8bb6c201952fba4f9325ba9...277d0722bfc26f5475d3c654dfa9cb65ba303b94
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/28a752ba35fca532e8bb6c201952fba4f9325ba9...277d0722bfc26f5475d3c654dfa9cb65ba303b94
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/20220414/c43fd67b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list