diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-09 10:27:49 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-12-09 10:27:49 -0500 |
| commit | 86d7512f428393a54251624072702549804f2a75 (patch) | |
| tree | c3f3244acc28bbcef1d747adfda22d60a5ec7667 /debian | |
| parent | c68e73b53fa2e1d6c60930f5f85f0ac52dabc825 (diff) | |
| download | mariadb-git-86d7512f428393a54251624072702549804f2a75.tar.gz | |
MDEV-7204: mariadb-galera-server el7 rpms packaging
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
when installing MariaDB-galera-server on
RedhatEL/OracleEL/(Others?) RPM based
* Added mariadb-server to "provides" for MariaDB Galera
server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/dist/Debian/control | 4 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 3e1e9f6bef8..5fe19dbd0f5 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -36,14 +36,14 @@ Description: MariaDB database regression test suite Package: mariadb-galera-server-5.5 Architecture: any -Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd +Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), bsdutils, libmariadbclient18 (>= ${binary:Version}), galera (>=25.2), - rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils + rsync, lsof, grep, gawk, iproute, coreutils, findutils Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server, virtual-mysql-server, mariadb-galera-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index c93b3c39fb9..02df9e4a5f5 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -36,14 +36,14 @@ Description: MariaDB database regression test suite Package: mariadb-galera-server-5.5 Architecture: any -Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd +Suggests: tinyca, mailx, mariadb-galera-test, netcat-openbsd, socat Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf Depends: mariadb-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), bsdutils, libmariadbclient18 (>= ${binary:Version}), galera (>=25.2), - rsync, lsof, socat, grep, gawk, iproute, coreutils, findutils + rsync, lsof, grep, gawk, iproute, coreutils, findutils Provides: mysql-server-core, mysql-server-core-5.1, mysql-server-core-5.5, mysql-server, virtual-mysql-server, mariadb-galera-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mariadb-galera-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, |