Fix upgrade errors on eoan

mariadb packages conflict with mysql-8.0
MariaDB · Nov 28, 2019 · 0d345ec · 0d345ec
1 parent dc7d0b5
commit 0d345ec
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/debian/control b/debian/control
@@ -259,6 +259,7 @@ Conflicts: mariadb-client-10.0,
            mysql-client-core-5.5,
            mysql-client-core-5.6,
            mysql-client-core-5.7,
+           mysql-client-core-8.0,
            virtual-mysql-client-core
 Replaces: mariadb-client-10.0,
           mariadb-client-10.1,
@@ -282,6 +283,7 @@ Replaces: mariadb-client-10.0,
           mysql-client-core-5.5,
           mysql-client-core-5.6,
           mysql-client-core-5.7,
+          mysql-client-core-8.0,
           virtual-mysql-client-core
 Provides: default-mysql-client-core,
           mysql-client-core,
@@ -320,6 +322,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
            mysql-client-5.5,
            mysql-client-5.6,
            mysql-client-5.7,
+           mysql-client-8.0,
            virtual-mysql-client
 Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.0,
@@ -335,6 +338,7 @@ Replaces: mariadb-client (<< ${source:Version}),
           mysql-client-5.5,
           mysql-client-5.6,
           mysql-client-5.7,
+          mysql-client-8.0,
           virtual-mysql-client
 Provides: default-mysql-client,
           mysql-client,
@@ -373,6 +377,7 @@ Conflicts: mariadb-server-core-10.0,
            mysql-server-core-5.5,
            mysql-server-core-5.6,
            mysql-server-core-5.7,
+           mysql-server-core-8.0,
            virtual-mysql-server-core
 Breaks: mariadb-client-10.0,
         mariadb-client-10.1,
@@ -397,6 +402,7 @@ Replaces: mariadb-client-10.0,
           mysql-server-core-5.5,
           mysql-server-core-5.6,
           mysql-server-core-5.7,
+          mysql-server-core-8.0,
           virtual-mysql-server-core
 Provides: default-mysql-server-core,
           mysql-server-core,
@@ -457,6 +463,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mysql-server-5.5,
            mysql-server-5.6,
            mysql-server-5.7,
+           mysql-server-8.0,
            virtual-mysql-server
 Replaces: libmariadbclient-dev (<< 5.5.0),
           libmariadbclient16 (<< 5.3.4),
@@ -479,6 +486,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
           mysql-server-5.5,
           mysql-server-5.6,
           mysql-server-5.7,
+          mysql-server-8.0,
           virtual-mysql-server
 Provides: default-mysql-server,
           virtual-mysql-server
@@ -724,6 +732,7 @@ Breaks: mariadb-server-5.5,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
+        mysql-testsuite-8.0,
         virtual-mysql-testsuite
 Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
@@ -734,6 +743,7 @@ Replaces: mariadb-server-5.5,
           mysql-testsuite-5.5,
           mysql-testsuite-5.6,
           mysql-testsuite-5.7,
+          mysql-testsuite-8.0,
           virtual-mysql-testsuite
 Provides: virtual-mysql-testsuite
 Suggests: patch