[Git][debian-gis-team/saga][master] 2 commits: Add patch support GDAL 3.5.0 Multi-Arch path in FindGDAL.cmake. (closes: #1012675)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / saga


Commits:
274f19fe by Bas Couwenberg at 2022-06-11T17:23:58+02:00
Add patch support GDAL 3.5.0 Multi-Arch path in FindGDAL.cmake. (closes: #1012675)

- - - - -
0c8e4256 by Bas Couwenberg at 2022-06-11T17:24:20+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gdal-multiarch.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+saga (8.2.1+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch support GDAL 3.5.0 Multi-Arch path in FindGDAL.cmake.
+    (closes: #1012675)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 11 Jun 2022 17:24:11 +0200
+
 saga (8.2.1+dfsg-2) unstable; urgency=medium
 
   * Add fix for saga_cmd which was not finding modules


=====================================
debian/patches/gdal-multiarch.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Add support for GDAL 3.5.0 Multi-Arch path.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/1012675
+Forwarded: https://sourceforge.net/p/saga-gis/bugs/294/
+
+--- a/saga-gis/cmake/modules/FindGDAL.cmake
++++ b/saga-gis/cmake/modules/FindGDAL.cmake
+@@ -176,7 +176,7 @@ ELSE(WIN32)
+             SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL FORCE)
+           ENDIF (NOT GDAL_LIBRARY)
+         ELSE (APPLE)
+-          FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} PATHS ${GDAL_LINK_DIRECTORIES}/lib)
++          FIND_LIBRARY(GDAL_LIBRARY NAMES ${GDAL_LIB_NAME} gdal PATHS ${GDAL_LINK_DIRECTORIES}/lib ${GDAL_LINK_DIRECTORIES})
+         ENDIF (APPLE)
+       
+       ELSE(GDAL_CONFIG)


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ multiarch_cmake.patch
 imagery_svm.patch
 python_fix.patch
 fix_module_path.patch
+gdal-multiarch.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/bd7030caa791becc519fc7d8c016a81901017242...0c8e4256cf59634d7f076f1937ef07e7c60d3aab

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/bd7030caa791becc519fc7d8c016a81901017242...0c8e4256cf59634d7f076f1937ef07e7c60d3aab
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/20220611/5886b673/attachment-0001.htm>