Skip to content

Commit

Permalink
debian packaging: drop bullseye
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jef-n authored and nyalldawson committed Jul 15, 2024
1 parent a42fdd8 commit a56f708
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
10 changes: 4 additions & 6 deletions debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,23 +60,21 @@ 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,
qt3d-assimpsceneimport-plugin,
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,
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion debian/libqgis-dev.install.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions debian/qgis-providers.install.in
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a56f708

Please sign in to comment.