diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:10:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-21 08:10:43 +0300 |
| commit | f70865bc9e540767d8afc3cc2cbe0e1c92a8c0be (patch) | |
| tree | 6124879fea26cce78090ec4e502e430c47b3b213 | |
| parent | c7cc3d04dacfdabd9bc04122dac05837794aac2a (diff) | |
| parent | f3b6c49f8f6326dfa6859f154d0069d5e735e7df (diff) | |
| download | mariadb-git-f70865bc9e540767d8afc3cc2cbe0e1c92a8c0be.tar.gz | |
Merge 10.2 into bb-10.2-ext
| -rw-r--r-- | debian/control | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/control b/debian/control index e2d99d61ad4..d75d7c40749 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,8 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3, - mariadb-server-5.5 (<< 5.5.33) + mariadb-server-5.5 (<< 5.5.33), + libmariadbclient18 (<< 10.2.0) Replaces: libmysqlclient19, libmysqlclient20 Provides: libmysqlclient19, |