Merge branch 'master' into export-scene-feature

qgis · Jul 19, 2020 · 7433219 · 7433219
2 parents f57f21e + 3af038f
commit 7433219
Show file tree

Hide file tree

Showing 2,245 changed files with 14,120 additions and 70,332 deletions.
diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake
@@ -47,13 +47,13 @@ ELSE(EXISTS PYQT5_VERSION)
   ENDIF(pyqt_config)
 
   IF(PYQT5_FOUND)
-    IF(NOT PYQT5_FIND_QUIETLY)
+    IF(NOT PyQt5_FIND_QUIETLY)
       MESSAGE(STATUS "Found PyQt5 version: ${PYQT5_VERSION_STR}")
     ENDIF(NOT PYQT5_FIND_QUIETLY)
   ELSE(PYQT5_FOUND)
-    IF(PYQT5_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Python")
-    ENDIF(PYQT5_FIND_REQUIRED)
+    IF(PyQt5_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find PyQt5")
+    ENDIF(PyQt5_FIND_REQUIRED)
   ENDIF(PYQT5_FOUND)
 
 ENDIF(EXISTS PYQT5_VERSION)
diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
@@ -52,6 +52,8 @@
         if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
             sip_dir = p
             break
+    else:
+        sys.exit(1)
     cfg = {
         'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
         'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,

diff --git a/debian/control.in b/debian/control.in
@@ -462,19 +462,93 @@ Description: collection of data providers to QGIS - architecture-independent fil
 
 Package: qgis-server
 Architecture: any
+Depends:
+ qgis-server-dummy (= ${binary:Version}),
+ qgis-server-wms (= ${binary:Version}),
+ qgis-server-wcs (= ${binary:Version}),
+ qgis-server-wfs (= ${binary:Version}),
+ qgis-server-wfs3 (= ${binary:Version}),
+ 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 is a meta-package depending on all QGIS Server components.
+
+Package: qgis-server-common
+Architecture: any
 Depends:
  qgis-providers (= ${binary:Version}),
  python3-qgis (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: qgis-mapserver
-Provides: qgis-mapserver
-Replaces: qgis-mapserver
 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 QGIS server.
+ This package contains the common QGIS server parts.
+
+Package: qgis-server-wms
+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 wms service.
+
+Package: qgis-server-wfs
+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 wfs service.
+
+Package: qgis-server-wfs3
+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 wfs 3 service.
+
+Package: qgis-server-wcs
+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 wcs service.
+
+Package: qgis-server-dummy
+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 sample service.
 
 Package: qgis-api-doc
 Architecture: all

diff --git a/debian/qgis-server.install → debian/qgis-server-common.install b/debian/qgis-server.install → debian/qgis-server-common.install
@@ -1,6 +1,5 @@
 usr/lib/cgi-bin/admin.sld
 usr/lib/cgi-bin/qgis_mapserv.fcgi
 usr/lib/cgi-bin/wms_metadata.xml
-usr/lib/qgis/server/*.so
 usr/share/qgis/resources/server/
 usr/bin/qgis_mapserver
diff --git a/debian/qgis-server-dummy.install b/debian/qgis-server-dummy.install
@@ -0,0 +1 @@
+usr/lib/qgis/server/libdummy.so
diff --git a/debian/qgis-server-wcs.install b/debian/qgis-server-wcs.install
@@ -0,0 +1 @@
+usr/lib/qgis/server/libwcs.so
diff --git a/debian/qgis-server-wfs.install b/debian/qgis-server-wfs.install
@@ -0,0 +1 @@
+usr/lib/qgis/server/libwfs.so
diff --git a/debian/qgis-server-wfs3.install b/debian/qgis-server-wfs3.install
@@ -0,0 +1 @@
+usr/lib/qgis/server/libwfs3.so
diff --git a/debian/qgis-server-wms.install b/debian/qgis-server-wms.install
@@ -0,0 +1 @@
+usr/lib/qgis/server/libwms.so
diff --git a/debian/qgis-server-wmts.install b/debian/qgis-server-wmts.install
@@ -0,0 +1 @@
+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
 

diff --git a/editors/QtCreator/templates/wizards/qgis/qgis_icon.svg b/editors/QtCreator/templates/wizards/qgis/qgis_icon.svg
diff --git a/images/composer/missing_image.svg b/images/composer/missing_image.svg
diff --git a/images/flags/af.svg b/images/flags/af.svg
diff --git a/images/flags/ar.svg b/images/flags/ar.svg
diff --git a/images/flags/bg.svg b/images/flags/bg.svg
diff --git a/images/flags/bn.svg b/images/flags/bn.svg
diff --git a/images/flags/bs.svg b/images/flags/bs.svg
diff --git a/images/flags/ca.svg b/images/flags/ca.svg
diff --git a/images/flags/cs.svg b/images/flags/cs.svg