From a56f70802359a9e84a861edda9916e04a8227f33 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Mon, 15 Jul 2024 10:47:47 +0200
Subject: [PATCH] debian packaging: drop bullseye

qgis.g.info now uses G_get_projwkt / G_get_projsrid, which was
introduced in GRASS 7.8.6, GRASS' version.h includes major and minor and
bullseye only has 7.8.5.
---
 debian/control.in                | 10 ++++------
 debian/libqgis-dev.install.in    |  1 -
 debian/qgis-providers.install.in |  4 ++--
 debian/rules                     |  8 ++------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index 1e37feceb4e1..ab6c6886483b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,8 +60,7 @@ Build-Depends:
  python3-pyqt5.qtserialport,
  python3-pyqt5.qtsql,
  python3-pyqt5.qtsvg,
-#bullseye# python3-sip-dev, python3-sip,
-#jammy kinetic lunar mantic noble bookworm sid# python3-pyqtbuild, sip-tools,
+ python3-pyqtbuild, sip-tools,
  python3-termcolor,
  python3-yaml,
  qt3d5-dev,
@@ -69,14 +68,13 @@ Build-Depends:
  qt3d-defaultgeometryloader-plugin,
  qt3d-gltfsceneio-plugin,
  qt3d-scene2d-plugin,
-#bullseye# qt5keychain-dev,
-#jammy kinetic lunar mantic noble bookworm sid# qtkeychain-qt5-dev,
+ qtkeychain-qt5-dev,
  qtbase5-dev,
  qtbase5-private-dev,
  qtpositioning5-dev,
  qttools5-dev-tools,
  qttools5-dev,
-#jammy bullseye# libpdal-dev, pdal,
+#jammy# libpdal-dev, pdal,
  libprotobuf-dev,
  protobuf-compiler,
  libzstd-dev,
@@ -439,7 +437,7 @@ Depends:
  libqca-qt5-2-plugins,
  libqt5sql5-sqlite,
  qt5-image-formats-plugins,
-#jammy kinetic lunar mantic noble bullseye bookworm sid# qt5-image-formats-plugin-pdf,
+#jammy kinetic lunar mantic noble bookworm sid# qt5-image-formats-plugin-pdf,
  ${shlibs:Depends},
  ${misc:Depends}
 Breaks: qgis (<= 1.6)
diff --git a/debian/libqgis-dev.install.in b/debian/libqgis-dev.install.in
index 2ae8ee4801d3..40ab8a9e234c 100644
--- a/debian/libqgis-dev.install.in
+++ b/debian/libqgis-dev.install.in
@@ -9,4 +9,3 @@ usr/lib/libqgis_server.so
 usr/lib/libqgisgrass?.so
 usr/lib/libqgispython.so
 usr/share/qgis/FindQGIS.cmake
-#bullseye#usr/share/sip/qgis
diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in
index 4c3d9f820f33..34bad4b10c54 100644
--- a/debian/qgis-providers.install.in
+++ b/debian/qgis-providers.install.in
@@ -1,5 +1,5 @@
 usr/lib/qgis/crssync
-#jammy bullseye#usr/lib/qgis/untwine
+#jammy#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 bullseye#usr/lib/qgis/plugins/libprovider_pdal.so
+#jammy#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 71d1645447ec..9ddbe98b9fef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ endif
 
 QT_PLUGINS_DIR = lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins
 
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"bullseye bookworm jammy kinetic lunar mantic noble"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"bookworm jammy kinetic lunar mantic noble"))
 	DISTRIBUTION := sid
 endif
 
@@ -106,7 +106,7 @@ ifneq ($(SHA),)
 	CMAKE_OPTS += -DSHA=$(SHA)
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"jammy bullseye"))
+ifneq (,$(findstring $(DISTRIBUTION),"jammy"))
 	CMAKE_OPTS += -DWITH_PDAL=TRUE
 else
 	CMAKE_OPTS += -DWITH_PDAL=FALSE
@@ -346,11 +346,9 @@ endif
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis_process
 
-ifeq (,$(findstring $(DISTRIBUTION),"bullseye"))
 	mkdir -p $(CURDIR)/debian/libqgis-dev
 	cd $(CURDIR)/debian/tmp && find . -name "*.sip" | tar --remove-files -cf - -T - | tar -C $(CURDIR)/debian/libqgis-dev -xf - --xform 's,\./usr/lib/python./dist-packages/qgis,usr/share/sip/qgis,'
 	find $(CURDIR)/debian/tmp/ -depth -empty -type d -delete
-endif
 
 override_dh_missing:
 	dh_missing --fail-missing
@@ -372,9 +370,7 @@ override_dh_installmime:
 override_dh_python3:
 	dh_python3
 	dh_python3 usr/share/qgis/grass/scripts
-ifneq (,$(findstring $(DISTRIBUTION),"bullseye"))
 	dh_sip3 -ppython3-qgis
-endif
 
 override_dh_compress:
 	dh_compress --exclude=pdf