diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 19:31:13 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-08-06 19:31:13 -0400 |
| commit | abbdc7ae860e70e30acc92bf4758d45bb8b46925 (patch) | |
| tree | 082bc63f91fa7c2b9b41b59976b5e396ba472521 | |
| parent | 627caa30b691cd674ea6568da9dc5f757c3aae1a (diff) | |
| download | mariadb-git-abbdc7ae860e70e30acc92bf4758d45bb8b46925.tar.gz | |
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.
| -rw-r--r-- | cmake/plugin.cmake | 2 | ||||
| -rw-r--r-- | debian/dist/Debian/control | 6 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 07372849a10..51949ef6672 100644 --- a/cmake/plugin.cmake +++ b/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") diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index e01350a14eb..2fa195b6367 100644 --- a/debian/dist/Debian/control +++ b/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. diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index b663c6e9cc9..33facc2d8bd 100644 --- a/debian/dist/Ubuntu/control +++ b/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. |