From c4b6eccc88b8fb4394598004e7928f5fcc18c4be Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Wed, 28 Aug 2024 18:28:42 +0200
Subject: [PATCH] debian packaging: include pdal support for noble-ubuntugis
 (fixes #58485)

---
 debian/control.in                |  2 +-
 debian/qgis-providers.install.in |  4 ++--
 debian/rules                     | 16 ++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index e6a3f2f6dfe..31d142e11e6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -75,7 +75,7 @@ Build-Depends:
  qtpositioning5-dev,
  qttools5-dev-tools,
  qttools5-dev,
-#jammy# libpdal-dev, pdal,
+#pdal# libpdal-dev, pdal,
  libprotobuf-dev,
  protobuf-compiler,
  libzstd-dev,
diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in
index 34bad4b10c5..7c3a6420e25 100644
--- a/debian/qgis-providers.install.in
+++ b/debian/qgis-providers.install.in
@@ -1,5 +1,5 @@
 usr/lib/qgis/crssync
-#jammy#usr/lib/qgis/untwine
+#pdal#usr/lib/qgis/untwine
 #pdal_wrench#usr/lib/qgis/pdal_wrench
 usr/lib/qgis/plugins/libauthmethod_apiheader.so
 usr/lib/qgis/plugins/libauthmethod_awss3.so
@@ -16,7 +16,7 @@ usr/lib/qgis/plugins/libprovider_gpx.so
 usr/lib/qgis/plugins/libprovider_hana.so
 usr/lib/qgis/plugins/libprovider_mdal.so
 usr/lib/qgis/plugins/libprovider_mssql.so
-#jammy#usr/lib/qgis/plugins/libprovider_pdal.so
+#pdal#usr/lib/qgis/plugins/libprovider_pdal.so
 usr/lib/qgis/plugins/libprovider_postgres.so
 usr/lib/qgis/plugins/libprovider_postgresraster.so
 usr/lib/qgis/plugins/libprovider_spatialite.so
diff --git a/debian/rules b/debian/rules
index 2a678abe100..26c14e01516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,12 +107,6 @@ ifneq ($(SHA),)
 	CMAKE_OPTS += -DSHA=$(SHA)
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"jammy"))
-	CMAKE_OPTS += -DWITH_PDAL=TRUE
-else
-	CMAKE_OPTS += -DWITH_PDAL=FALSE
-endif
-
 ifneq (,$(findstring ;$(GRASSVER);, ";7;8;"))
 	CMAKE_OPTS += \
 		-DWITH_GRASS=TRUE \
@@ -201,6 +195,16 @@ endif
 
 CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)
 
+ifneq (,$(findstring $(DISTRIBUTION),"jammy"))
+	CONTROL_EXPRESSIONS += pdal
+	CMAKE_OPTS += -DWITH_PDAL=TRUE
+else ifneq (,$(findstring -noble-ubuntugis-,$(DEB_BUILD_NAME)))
+	CONTROL_EXPRESSIONS += pdal
+	CMAKE_OPTS += -DWITH_PDAL=TRUE
+else
+	CMAKE_OPTS += -DWITH_PDAL=FALSE
+endif
+
 ifneq (,$(WITH_APIDOC))
 CONTROL_EXPRESSIONS += apidoc
 endif