Skip to content
Permalink
Browse files

debian packaging fixes:

* include qgis-server-wmts
* fix Qt53DExtras cmake module lookup
  • Loading branch information
jef-n committed Aug 2, 2020
1 parent 46a9153 commit 48619cf552e861591f5d09fba881ddb28b996db6
Showing with 18 additions and 5 deletions.
  1. +3 −3 debian/control
  2. +13 −0 debian/control.in
  3. +2 −2 debian/rules
@@ -114,9 +114,9 @@ Description: Geographic Information System (GIS)
Package: qgis-common
Architecture: all
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -465,6 +465,7 @@ Architecture: any
Depends:
qgis-server-dummy (= ${binary:Version}),
qgis-server-wms (= ${binary:Version}),
qgis-server-wmts (= ${binary:Version}),
qgis-server-wcs (= ${binary:Version}),
qgis-server-wfs (= ${binary:Version}),
qgis-server-wfs3 (= ${binary:Version}),
@@ -502,6 +503,18 @@ Description: QGIS server providing various OGC services
.
This package contains the wms service.

Package: qgis-server-wmts
Architecture: any
Depends:
qgis-server-common (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
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.

Package: qgis-server-wfs
Architecture: any
Depends:
@@ -120,11 +120,11 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so

$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h)
$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h -a -f /usr/lib/$(DEB_BUILD_MULTIARCH)/cmake/Qt53DExtras/Qt53DExtrasConfig.cmake)
ifneq (0,$(.SHELLSTATUS))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
CMAKE_OPTS += \
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
-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

0 comments on commit 48619cf

Please sign in to comment.
You can’t perform that action at this time.