Skip to content

Commit 26a4bde

Browse files
ltangvaldprashanttekriwal
authored andcommitted
Bug#25648545 PACKAGING CONFLICTS WITH MARIADB PACKAGES ON DEBIAN/UBUNTU
Added conflicts: * mysql-packagesource-client conflicts with mariadb client * mysql-packagesource-server conflicts with mariadb server * mysql-packagesource-test conflicts with mariadb test package (cherry picked from commit 7b50590b2512eb063f2d6c012aca7e4b52d17558)
1 parent f433af6 commit 26a4bde

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

packaging/deb-in/control.in

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ Conflicts: mysql,
3030
mysql-server-5.5, mysql-server-core-5.5,
3131
mysql-server-5.6, mysql-server-core-5.6,
3232
mysql-server-5.7, mysql-server-core-5.7,
33-
mysql-@DEB_NOTPRODUCTNAME@-server
33+
mysql-@DEB_NOTPRODUCTNAME@-server,
34+
mariadb-server-5.5, mariadb-server-core-5.5,
35+
mariadb-server-10.0, mariadb-server-core-10.0,
36+
mariadb-server-10.1, mariadb-server-core-10.1,
37+
mariadb-server-10.2, mariadb-server-core-10.2
3438
Replaces: mysql,
3539
mysql-server-5.0, mysql-server-core-5.0,
3640
mysql-server-5.1, mysql-server-core-5.1,
@@ -70,7 +74,11 @@ Conflicts: mysql,
7074
mysql-client-5.5, mysql-client-core-5.5,
7175
mysql-client-5.6, mysql-client-core-5.6,
7276
mysql-client-5.7, mysql-client-core-5.7,
73-
mysql-@DEB_NOTPRODUCTNAME@-client
77+
mysql-@DEB_NOTPRODUCTNAME@-client,
78+
mariadb-client-5.5, mariadb-client-core-5.5,
79+
mariadb-client-10.0, mariadb-client-core-10.0,
80+
mariadb-client-10.1, mariadb-client-core-10.1,
81+
mariadb-client-10.2, mariadb-client-core-10.2
7482
Replaces: mysql,
7583
mysql-client-5.0, mysql-client-core-5.0,
7684
mysql-client-5.1, mysql-client-core-5.1,
@@ -176,7 +184,8 @@ Breaks: mysql-@DEB_PRODUCTNAME@-server (<< 5.6.36),
176184
mysql-@DEB_PRODUCTNAME@-client (<< 5.6.36)
177185
Conflicts: mysql,
178186
mysql-testsuite-5.0, mysql-testsuite-5.1, mysql-testsuite-5.5,
179-
mysql-testsuite-5.6, mysql-testsuite-5.7, mysql-@DEB_NOTPRODUCTNAME@-test
187+
mysql-testsuite-5.6, mysql-testsuite-5.7, mysql-@DEB_NOTPRODUCTNAME@-test,
188+
mariadb-test, mariadb-test-data
180189
Description: MySQL Test Run MTR - The MySQL testsuite
181190
The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
182191
and robust SQL (Structured Query Language) database server. MySQL Server

0 commit comments

Comments
 (0)