Skip to content

Commit 0d345ec

Browse files
committed
Fix upgrade errors on eoan
mariadb packages conflict with mysql-8.0
1 parent dc7d0b5 commit 0d345ec

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

debian/control

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ Conflicts: mariadb-client-10.0,
259259
mysql-client-core-5.5,
260260
mysql-client-core-5.6,
261261
mysql-client-core-5.7,
262+
mysql-client-core-8.0,
262263
virtual-mysql-client-core
263264
Replaces: mariadb-client-10.0,
264265
mariadb-client-10.1,
@@ -282,6 +283,7 @@ Replaces: mariadb-client-10.0,
282283
mysql-client-core-5.5,
283284
mysql-client-core-5.6,
284285
mysql-client-core-5.7,
286+
mysql-client-core-8.0,
285287
virtual-mysql-client-core
286288
Provides: default-mysql-client-core,
287289
mysql-client-core,
@@ -320,6 +322,7 @@ Conflicts: mariadb-client (<< ${source:Version}),
320322
mysql-client-5.5,
321323
mysql-client-5.6,
322324
mysql-client-5.7,
325+
mysql-client-8.0,
323326
virtual-mysql-client
324327
Replaces: mariadb-client (<< ${source:Version}),
325328
mariadb-client-10.0,
@@ -335,6 +338,7 @@ Replaces: mariadb-client (<< ${source:Version}),
335338
mysql-client-5.5,
336339
mysql-client-5.6,
337340
mysql-client-5.7,
341+
mysql-client-8.0,
338342
virtual-mysql-client
339343
Provides: default-mysql-client,
340344
mysql-client,
@@ -373,6 +377,7 @@ Conflicts: mariadb-server-core-10.0,
373377
mysql-server-core-5.5,
374378
mysql-server-core-5.6,
375379
mysql-server-core-5.7,
380+
mysql-server-core-8.0,
376381
virtual-mysql-server-core
377382
Breaks: mariadb-client-10.0,
378383
mariadb-client-10.1,
@@ -397,6 +402,7 @@ Replaces: mariadb-client-10.0,
397402
mysql-server-core-5.5,
398403
mysql-server-core-5.6,
399404
mysql-server-core-5.7,
405+
mysql-server-core-8.0,
400406
virtual-mysql-server-core
401407
Provides: default-mysql-server-core,
402408
mysql-server-core,
@@ -457,6 +463,7 @@ Conflicts: mariadb-server (<< ${source:Version}),
457463
mysql-server-5.5,
458464
mysql-server-5.6,
459465
mysql-server-5.7,
466+
mysql-server-8.0,
460467
virtual-mysql-server
461468
Replaces: libmariadbclient-dev (<< 5.5.0),
462469
libmariadbclient16 (<< 5.3.4),
@@ -479,6 +486,7 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
479486
mysql-server-5.5,
480487
mysql-server-5.6,
481488
mysql-server-5.7,
489+
mysql-server-8.0,
482490
virtual-mysql-server
483491
Provides: default-mysql-server,
484492
virtual-mysql-server
@@ -724,6 +732,7 @@ Breaks: mariadb-server-5.5,
724732
mysql-testsuite-5.5,
725733
mysql-testsuite-5.6,
726734
mysql-testsuite-5.7,
735+
mysql-testsuite-8.0,
727736
virtual-mysql-testsuite
728737
Replaces: mariadb-server-5.5,
729738
mariadb-test-10.0,
@@ -734,6 +743,7 @@ Replaces: mariadb-server-5.5,
734743
mysql-testsuite-5.5,
735744
mysql-testsuite-5.6,
736745
mysql-testsuite-5.7,
746+
mysql-testsuite-8.0,
737747
virtual-mysql-testsuite
738748
Provides: virtual-mysql-testsuite
739749
Suggests: patch

0 commit comments

Comments
 (0)