From 6c95845d865720b304f8d69e44449a875741030c Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 26 Oct 2021 16:36:58 +0200 Subject: [PATCH] debian packaging: fix install of sip files on impish and unstable --- debian/libqgis-dev.install.in | 3 +-- debian/rules | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/libqgis-dev.install.in b/debian/libqgis-dev.install.in index 40f55e4d7c2..922fa2bc09e 100644 --- a/debian/libqgis-dev.install.in +++ b/debian/libqgis-dev.install.in @@ -9,5 +9,4 @@ usr/lib/libqgis_server.so usr/lib/libqgisgrass?.so usr/lib/libqgispython.so usr/share/qgis/FindQGIS.cmake -usr/share/sip/qgis -#sid#usr/lib/python?/*-packages/qgis +#!sid !impish#usr/share/sip/qgis diff --git a/debian/rules b/debian/rules index f6eeafe58da..8633336b125 100755 --- a/debian/rules +++ b/debian/rules @@ -329,6 +329,12 @@ 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),"sid impish")) + 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 @@ -349,7 +355,9 @@ override_dh_installmime: override_dh_python3: dh_python3 dh_python3 usr/share/qgis/grass/scripts +ifeq (,$(findstring $(DISTRIBUTION),"sid impish")) dh_sip3 -ppython3-qgis +endif override_dh_compress: dh_compress --exclude=pdf