diff --git a/debian/control.in b/debian/control.in index 574979075c4..57eefcb4beb 100644 --- a/debian/control.in +++ b/debian/control.in @@ -58,7 +58,7 @@ Build-Depends: python3-pyqt5.qtsql, python3-pyqt5.qtsvg, #bullseye focal# python3-sip-dev, python3-sip, -#sid jammy kinetic# python3-pyqtbuild, sip-tools, +#sid jammy kinetic lunar# python3-pyqtbuild, sip-tools, python3-termcolor, python3-yaml, qt3d5-dev, @@ -67,13 +67,13 @@ Build-Depends: qt3d-gltfsceneio-plugin, qt3d-scene2d-plugin, #bullseye focal# qt5keychain-dev, -#jammy kinetic sid# qtkeychain-qt5-dev, +#jammy kinetic lunar sid# qtkeychain-qt5-dev, qtbase5-dev, qtbase5-private-dev, qtpositioning5-dev, qttools5-dev-tools, qttools5-dev, -#!sid !kinetic# libpdal-dev, pdal, +#!sid !kinetic !lunar# libpdal-dev, pdal, libprotobuf-dev, protobuf-compiler, libzstd-dev, @@ -422,7 +422,8 @@ Depends: Breaks: python-qgis-common (<< ${source:Version}) Replaces: python-qgis-common (<< ${source:Version}) Suggests: -#focal jammy kinetic bullseye sid# otb-qgis +#focal jammy kinetic lunar bullseye sid# otb-qgis + saga Description: Python bindings to QGIS - architecture-independent files QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -440,7 +441,7 @@ Depends: libqca-qt5-2-plugins, libqt5sql5-sqlite, qt5-image-formats-plugins, -#bullseye sid jammy kinetic# qt5-image-formats-plugin-pdf, +#bullseye sid jammy kinetic lunar# 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 7f6338935cb..018a3fc423f 100644 --- a/debian/libqgis-dev.install.in +++ b/debian/libqgis-dev.install.in @@ -9,4 +9,4 @@ usr/lib/libqgis_server.so usr/lib/libqgisgrass?.so usr/lib/libqgispython.so usr/share/qgis/FindQGIS.cmake -#!sid !jammy !kinetic#usr/share/sip/qgis +#!sid !jammy !kinetic !lunar#usr/share/sip/qgis diff --git a/debian/qgis-providers.install.in b/debian/qgis-providers.install.in index dd4cc5f1df0..0eeaaf22459 100644 --- a/debian/qgis-providers.install.in +++ b/debian/qgis-providers.install.in @@ -1,5 +1,5 @@ usr/lib/qgis/crssync -#!sid !kinetic#usr/lib/qgis/untwine +#!sid !kinetic !lunar#usr/lib/qgis/untwine usr/lib/qgis/plugins/libauthmethod_basic.so usr/lib/qgis/plugins/libauthmethod_esritoken.so usr/lib/qgis/plugins/libauthmethod_identcert.so @@ -15,7 +15,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 -#!sid !kinetic#usr/lib/qgis/plugins/libprovider_pdal.so +#!sid !kinetic !lunar#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 d049a2454a8..69f4f963e4d 100755 --- a/debian/rules +++ b/debian/rules @@ -41,7 +41,7 @@ endif QT_PLUGINS_DIR = lib/$(DEB_BUILD_MULTIARCH)/qt5/plugins -ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"bullseye focal jammy kinetic")) +ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"bullseye focal jammy kinetic lunar")) DISTRIBUTION := sid endif @@ -106,7 +106,7 @@ ifneq ($(SHA),) CMAKE_OPTS += -DSHA=$(SHA) endif -ifeq (,$(findstring $(DISTRIBUTION),"sid kinetic")) +ifeq (,$(findstring $(DISTRIBUTION),"sid kinetic lunar")) CMAKE_OPTS += -DWITH_PDAL=TRUE endif @@ -117,7 +117,7 @@ ifneq (,$(findstring ;$(GRASSVER);, ";7;8;")) -DGRASS_PREFIX$(GRASSVER)=/usr/lib/$(GRASS) endif -ifneq (,$(findstring $(DISTRIBUTION),"sid kinetic")) +ifneq (,$(findstring $(DISTRIBUTION),"sid kinetic lunar")) CMAKE_OPTS += -DGDAL_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgdal.so endif @@ -325,7 +325,7 @@ override_dh_auto_install: 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 -ifneq (,$(findstring $(DISTRIBUTION),"jammy kinetic sid")) +ifneq (,$(findstring $(DISTRIBUTION),"jammy kinetic lunar sid")) 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 @@ -351,7 +351,7 @@ override_dh_installmime: override_dh_python3: dh_python3 dh_python3 usr/share/qgis/grass/scripts -ifeq (,$(findstring $(DISTRIBUTION),"jammy kinetic sid")) +ifeq (,$(findstring $(DISTRIBUTION),"jammy kinetic lunar sid")) dh_sip3 -ppython3-qgis endif