mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Nirbhay Choubey 2014-08-06 19:31:13 -04:00
parent 627caa30b6
commit abbdc7ae86
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/plugin.cmake
View file

@ -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")

6
debian/dist/Debian/control vendored
View file

@ -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.

6
debian/dist/Ubuntu/control vendored
View file

@ -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.