MDEV-6118: Unable to install "MariaDB-connect-engine" when

using "MariaDB-Galera-server"

rpm: Updated components' requires-list to include "MariaDB"
     instead of "MariaDB-server".

deb: Added (ORed) 'mariadb-galera-server-10.0' to the 'Depends'
     list of connect and oqgraph engine packages.

cmake/plugin.cmake

@@ -195,7 +195,7 @@ MACRO(MYSQL_ADD_PLUGIN)
     IF(ARG_COMPONENT)
       IF(CPACK_COMPONENTS_ALL AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
         SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} PARENT_SCOPE)
-        SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE)
+        SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB" PARENT_SCOPE)
 
         IF (NOT ARG_CONFIG)
           SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")

debian/dist/Debian/control

@@ -249,8 +249,8 @@ Description: MariaDB database regression test suite (metapackage depending on th
 Package: mariadb-connect-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, unixODBC, libxml2
-Build-depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2
+Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
@@ -259,7 +259,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-oqgraph-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, libjudydebian1
+Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1
 Description: Oqgraph storage engine for MariaDB
  The OQGRAPH engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.

debian/dist/Ubuntu/control

@@ -243,8 +243,8 @@ Description: MariaDB database regression test suite (metapackage depending on th
 Package: mariadb-connect-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, unixODBC, libxml2
-Build-depends: mariadb-server-10.0, unixODBC-dev, libxml2-dev
+Depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC, libxml2
+Build-depends: mariadb-server-10.0|mariadb-galera-server-10.0, unixODBC-dev, libxml2-dev
 Description: Connect storage engine for MariaDB
  Connect engine supports a number of file formats (dbf, xml, txt, bin, etc),
  connections to ODBC tables and remote MySQL tables, as well as a number of
@@ -253,7 +253,7 @@ Description: Connect storage engine for MariaDB
 Package: mariadb-oqgraph-engine-10.0
 Section: database
 Architecture: any
-Depends: mariadb-server-10.0, libjudydebian1
+Depends: mariadb-server-10.0|mariadb-galera-server-10.0, libjudydebian1
 Description: Oqgraph storage engine for MariaDB
  The OQGRAPH engine is a computation engine plugin for handling hierarchies
  (trees) and graphs (friend-of-a-friend, etc) cleanly through standard SQL.