From dcc76674cf3620c49940db78468e5b65cefdc36b Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 15 Jan 2025 18:03:53 +0100 Subject: [PATCH] fix debian package --- debian/control | 1 + debian/control.in | 16 +++++++++------- debian/rules | 20 ++++++++++---------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/debian/control b/debian/control index 590317c5ab5..bbfcfe59a38 100644 --- a/debian/control +++ b/debian/control @@ -85,6 +85,7 @@ Standards-Version: 3.9.7 Vcs-Browser: https://github.com/qgis/QGIS/ Vcs-Git: https://github.com/qgis/QGIS.git Homepage: https://qgis.org/ +Rules-Requires-Root: no Package: qgis Architecture: any diff --git a/debian/control.in b/debian/control.in index f23fbe291bf..3313c439839 100644 --- a/debian/control.in +++ b/debian/control.in @@ -43,7 +43,7 @@ Build-Depends: opencl-headers, #oracle# oracle-instantclient-basiclite, #oracle# oracle-instantclient-devel, - pkg-config, + pkgconf, pyqt5-dev-tools, pyqt5-dev, pyqt5.qsci-dev, @@ -61,7 +61,8 @@ Build-Depends: python3-pyqt5.qtserialport, python3-pyqt5.qtsql, python3-pyqt5.qtsvg, - python3-pyqtbuild, sip-tools, + python3-pyqtbuild, + sip-tools, python3-termcolor, python3-yaml, qt3d5-dev, @@ -99,6 +100,7 @@ Standards-Version: 3.9.7 Vcs-Browser: https://github.com/qgis/QGIS/ Vcs-Git: https://github.com/qgis/QGIS.git Homepage: https://qgis.org/ +Rules-Requires-Root: no Package: qgis Architecture: any @@ -502,7 +504,7 @@ Description: QGIS server providing various OGC services QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the wms service. + This package contains the WMS service. Package: qgis-server-wmts Architecture: any @@ -514,7 +516,7 @@ Description: QGIS server providing various OGC services QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the wmts service. + This package contains the WMTS service. Package: qgis-server-wfs Architecture: any @@ -526,7 +528,7 @@ Description: QGIS server providing various OGC services QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the wfs service. + This package contains the WFS service. Package: qgis-server-wfs3 Architecture: any @@ -538,7 +540,7 @@ Description: QGIS server providing various OGC services QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the wfs 3 service. + This package contains the WFS 3 service. Package: qgis-server-wcs Architecture: any @@ -550,7 +552,7 @@ Description: QGIS server providing various OGC services QGIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the wcs service. + This package contains the WCS service. Package: qgis-server-landingpage Architecture: any diff --git a/debian/rules b/debian/rules index 90f70ae275c..2540cfcf1cb 100755 --- a/debian/rules +++ b/debian/rules @@ -58,7 +58,7 @@ GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1)) GRASSABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/')) # Include percentage of started edges -export NINJA_STATUS=[%f/%t %p] +export NINJA_STATUS=[%f/%t %p] ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS))) NINJA_OPTS += -v @@ -123,7 +123,7 @@ $(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasver ifneq (0,$(.SHELLSTATUS)) # Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu CMAKE_OPTS += \ - -DQt53DExtras_DIR=$(realpath external/qt3dextra-headers/cmake/Qt53DExtras) \ + -DQt53DExtras_DIR=$(realpath external/qt3dextra-headers/cmake/Qt53DExtras) \ -DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \ -DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so endif @@ -315,8 +315,8 @@ endif $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/MetaSearch/LICENSE.txt - $(RM) $(CURDIR)/debian/tmp/usr/bin/test_provider_wcs $(RM) $(CURDIR)/debian/tmp/usr/bin/qgis_bench + $(RM) $(CURDIR)/debian/tmp/usr/bin/test_provider_wcs $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/resources/wcs-servers.json # remove documentation outside usr/share/doc @@ -333,13 +333,13 @@ endif mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db # Mime info - install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages - install -o root -g root -m 644 $(CURDIR)/debian/qgis.xml $(CURDIR)/debian/tmp/usr/share/mime/packages + install -d $(CURDIR)/debian/tmp/usr/share/mime/packages + install -m 644 $(CURDIR)/debian/qgis.xml $(CURDIR)/debian/tmp/usr/share/mime/packages # qgis binaries - install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin - install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin - install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis_process $(CURDIR)/debian/qgis/usr/bin/qgis_process.bin + install -m 755 -d $(CURDIR)/debian/qgis/usr/bin + install -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin + install -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis_process $(CURDIR)/debian/qgis/usr/bin/qgis_process.bin $(RM) $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/tmp/usr/bin/qgis_process @@ -349,8 +349,8 @@ endif -e "s#\{ORACLE_LIBDIR\}#$(ORACLE_LIBDIR)#g" \ $(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh - 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 + install -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis + install -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis_process 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,'