[Git][debian-gis-team/qgis][master] Export DEB_PYTHON_INSTALL_LAYOUT=deb_system to fix FTBFS with CMake 3.27.0 instead of a patch.

[Bas Couwenberg (@sebastic)]

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


Commits:
713736f3 by Bas Couwenberg at 2023-07-22T12:46:09+02:00
Export DEB_PYTHON_INSTALL_LAYOUT=deb_system to fix FTBFS with CMake 3.27.0 instead of a patch.

- - - - -


4 changed files:

- debian/changelog
- − debian/patches/cmake-3.27.0.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+qgis (3.28.9+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Export DEB_PYTHON_INSTALL_LAYOUT=deb_system to fix FTBFS with CMake 3.27.0
+    instead of a patch.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Jul 2023 12:45:04 +0200
+
 qgis (3.28.9+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream release.


=====================================
debian/patches/cmake-3.27.0.patch deleted
=====================================
@@ -1,14 +0,0 @@
-Description: Fix wrong Python_SITEARCH returned by CMake 3.27.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://bugs.debian.org/1041633
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -970,6 +970,7 @@ endif()
- 
- message("-- Found Python executable: ${Python_EXECUTABLE} (version ${Python_VERSION})")
- message("-- Python library: ${Python_LIBRARIES}")
-+string(REGEX REPLACE "^/usr/(local/)?lib/python3.[0-9]+/dist-packages" "/usr/lib/python3/dist-packages" Python_SITEARCH ${Python_SITEARCH})
- message("-- Python site-packages: ${Python_SITEARCH}")
- 
- if (WITH_CORE AND WITH_BINDINGS AND NOT BUILD_WITH_QT6)


=====================================
debian/patches/series
=====================================
@@ -2,4 +2,3 @@ developersmap-use-debian-package.patch
 exclude-elvensword-resources.patch
 exclude-cc-by-nc-resources.patch
 spelling-errors.patch
-cmake-3.27.0.patch


=====================================
debian/rules
=====================================
@@ -10,6 +10,8 @@ export DH_OPTIONS
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+export DEB_PYTHON_INSTALL_LAYOUT=deb_system
+
 include /usr/share/dpkg/pkg-info.mk
 
 # These are used for cross-compiling and for saving the configure script



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/713736f3fdc384f54036accb8ea8229603bca92e

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/-/commit/713736f3fdc384f54036accb8ea8229603bca92e
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/20230722/3b326dd2/attachment-0001.htm>