fix f54c8fb

qgis · Jul 13, 2020 · ffe9dd5 · ffe9dd5
1 parent 384962b
commit ffe9dd5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-/usr/lib/qgis/server/libwmts.so
+usr/lib/qgis/server/libwmts.so
diff --git 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