Merge 10.2 into bb-10.2-ext

This commit is contained in:
Marko Mäkelä 2017-09-21 08:10:43 +03:00
commit f70865bc9e

3
debian/control vendored
View File

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