From ffe9dd554be794ca45d13acc6001edd8b2cf4d93 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 13 Jul 2020 10:47:51 +0200 Subject: [PATCH] fix f54c8fb7ee --- debian/qgis-server-dummy.install | 2 +- debian/qgis-server-wfs.install | 2 +- debian/qgis-server-wfs3.install | 2 +- debian/qgis-server-wms.install | 2 +- debian/qgis-server-wmts.install | 2 +- debian/rules | 2 -- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/debian/qgis-server-dummy.install b/debian/qgis-server-dummy.install index c8c414fa87f..478159ce729 100644 --- a/debian/qgis-server-dummy.install +++ b/debian/qgis-server-dummy.install @@ -1 +1 @@ -/usr/lib/qgis/server/libdummy.so +usr/lib/qgis/server/libdummy.so diff --git a/debian/qgis-server-wfs.install b/debian/qgis-server-wfs.install index 6b92f5e249d..b46988a7645 100644 --- a/debian/qgis-server-wfs.install +++ b/debian/qgis-server-wfs.install @@ -1 +1 @@ -/usr/lib/qgis/server/libwfs.so +usr/lib/qgis/server/libwfs.so diff --git a/debian/qgis-server-wfs3.install b/debian/qgis-server-wfs3.install index 4784a740269..5e271f97b5b 100644 --- a/debian/qgis-server-wfs3.install +++ b/debian/qgis-server-wfs3.install @@ -1 +1 @@ -/usr/lib/qgis/server/libwfs3.so +usr/lib/qgis/server/libwfs3.so diff --git a/debian/qgis-server-wms.install b/debian/qgis-server-wms.install index 985513db97a..fb127b776cc 100644 --- a/debian/qgis-server-wms.install +++ b/debian/qgis-server-wms.install @@ -1 +1 @@ -/usr/lib/qgis/server/libwms.so +usr/lib/qgis/server/libwms.so diff --git a/debian/qgis-server-wmts.install b/debian/qgis-server-wmts.install index 9ce7b3ae3b4..c72ff0283cf 100644 --- a/debian/qgis-server-wmts.install +++ b/debian/qgis-server-wmts.install @@ -1 +1 @@ -/usr/lib/qgis/server/libwmts.so +usr/lib/qgis/server/libwmts.so diff --git a/debian/rules b/debian/rules index 74d0d9aca81..18ec3c3e90e 100755 --- a/debian/rules +++ b/debian/rules @@ -120,7 +120,6 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal")) -DWITH_3D=TRUE \ -DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so -ifneq (,$(findstring $(DISTRIBUTION),"buster eoan focal")) $(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h) ifneq (0,$(.SHELLSTATUS)) # Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu @@ -129,7 +128,6 @@ ifneq (0,$(.SHELLSTATUS)) -DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \ -DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so endif -endif endif