Merge 10.2 into bb-10.2-ext

f70865bc · Marko Mäkelä · c7cc3d04 · f3b6c49f · f70865bc
Commit f70865bc authored Sep 21, 2017 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

debian/control debian/control +2 -1

No files found.
--- 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,