diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-10-09 10:30:11 +0200 |
| commit | 1b75bed00fa4ea3925f513f4825deb00cb158d5b (patch) | |
| tree | 0822ed2a2ca42ba1acb82a6737336bbfe219bebe /debian/dist | |
| parent | 689ffe3559a4b7bacd13503ba93659b2f4560bbb (diff) | |
| parent | b2d71434ed24d0901155fe68b0b7ee4fdad0e2d4 (diff) | |
| download | mariadb-git-1b75bed00fa4ea3925f513f4825deb00cb158d5b.tar.gz | |
5.5.40+ merge
Diffstat (limited to 'debian/dist')
| -rw-r--r-- | debian/dist/Debian/control | 5 | ||||
| -rw-r--r-- | debian/dist/Ubuntu/control | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index 0a6055a4604..ffede25ccc4 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -192,7 +192,10 @@ Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}) +Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, + perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, + passwd, lsb-base (>= 3.0-10), bsdutils, + mariadb-server-core-10.0 (>= ${binary:Version}) Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-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 f7988783ca6..02ace29b67b 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -186,7 +186,10 @@ Architecture: any Suggests: tinyca, mailx, mariadb-test Recommends: libhtml-template-perl Pre-Depends: mariadb-common, adduser (>= 3.40), debconf -Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mariadb-server-core-10.0 (>= ${binary:Version}) +Depends: mariadb-client-10.0 (>= ${source:Version}), libdbi-perl, + perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, + passwd, lsb-base (>= 3.0-10), bsdutils, + mariadb-server-core-10.0 (>= ${binary:Version}) Provides: mariadb-server, mysql-server, virtual-mysql-server Conflicts: mariadb-server (<< ${source:Version}), mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.0, mysql-server-5.1, mysql-server-5.5, |