Merge 10.2 into bb-10.2-ext

MariaDB · Sep 21, 2017 · f70865b · f70865b
2 parents c7cc3d0 + f3b6c49
commit f70865b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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,