mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 08:44:33 +01:00
Deb: Add Breaks/Replaces
Fix the following Breaks/Replaces errors detected by Salsa-CI: [ERROR] mariadb-server-10.5 conflicts with mysql-client-core-8.0 files: {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'} [ERROR] mariadb-server-10.5 conflicts with mysql-server-core-8.0 files: {'/usr/share/man/man1/mysqlbinlog.1.gz', '/usr/share/man/man1/myisamlog.1.gz', '/usr/share/man/man1/mysql_tzinfo_to_sql.1.gz', '/usr/share/man/man1/perror.1.gz', '/usr/share/man/man1/myisampack.1.gz', '/usr/bin/mysqld_safe', '/usr/share/man/man1/myisamchk.1.gz', '/usr/bin/myisamchk', '/usr/bin/mysql_secure_installation', '/usr/bin/mysqld_multi', '/usr/bin/mysql_tzinfo_to_sql', '/usr/bin/perror', '/usr/share/man/man1/mysqld_multi.1.gz', '/usr/bin/myisampack', '/usr/share/man/man1/mysqld_safe.1.gz', '/usr/bin/myisamlog', '/usr/share/man/man1/mysql_secure_installation.1.gz', '/usr/bin/mysqlbinlog'} [ERROR] mariadb-test conflicts with mysql-server-core-8.0 files: {'/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/mypluglib.so'} Upstreamed from Debian packaging commits:9b6a67b53c
f6d5545a02
Also: - remove excess '<< ${source:Version}' on mysql-client-* and mysql-server-* - move more packages to Conflicts as it is semantically more correct than having those packages in Replaces
This commit is contained in:
parent
ab3777a3bf
commit
5a4daa9099
2 changed files with 32 additions and 29 deletions
debian
56
debian/control
vendored
56
debian/control
vendored
|
@ -278,7 +278,7 @@ Conflicts: mariadb-client-10.0,
|
|||
mysql-client (<< 5.0.51),
|
||||
mysql-client-5.0,
|
||||
mysql-client-5.1,
|
||||
mysql-client-5.5 (<< ${source:Version}),
|
||||
mysql-client-5.5,
|
||||
mysql-client-core-5.1,
|
||||
mysql-client-core-5.5,
|
||||
mysql-client-core-5.6,
|
||||
|
@ -351,11 +351,11 @@ Conflicts: mariadb-client (<< ${source:Version}),
|
|||
mysql-client-5.7,
|
||||
mysql-client-8.0,
|
||||
mysql-client-core-5.0,
|
||||
mysql-client-core-5.1 (<< ${source:Version}),
|
||||
mysql-client-core-5.5 (<< ${source:Version}),
|
||||
mysql-client-core-5.6 (<< ${source:Version}),
|
||||
mysql-client-core-5.7 (<< ${source:Version}),
|
||||
mysql-client-core-8.0 (<< ${source:Version}),
|
||||
mysql-client-core-5.1,
|
||||
mysql-client-core-5.5,
|
||||
mysql-client-core-5.6,
|
||||
mysql-client-core-5.7,
|
||||
mysql-client-core-8.0,
|
||||
mytop,
|
||||
virtual-mysql-client
|
||||
Breaks: mariadb-client-core-10.0,
|
||||
|
@ -390,11 +390,11 @@ Replaces: mariadb-client (<< ${source:Version}),
|
|||
mysql-client-5.7,
|
||||
mysql-client-8.0,
|
||||
mysql-client-core-5.0,
|
||||
mysql-client-core-5.1 (<< ${source:Version}),
|
||||
mysql-client-core-5.5 (<< ${source:Version}),
|
||||
mysql-client-core-5.6 (<< ${source:Version}),
|
||||
mysql-client-core-5.7 (<< ${source:Version}),
|
||||
mysql-client-core-8.0 (<< ${source:Version}),
|
||||
mysql-client-core-5.1,
|
||||
mysql-client-core-5.5,
|
||||
mysql-client-core-5.6,
|
||||
mysql-client-core-5.7,
|
||||
mysql-client-core-8.0,
|
||||
mytop,
|
||||
virtual-mysql-client
|
||||
Provides: default-mysql-client,
|
||||
|
@ -520,11 +520,12 @@ Conflicts: mariadb-server (<< ${source:Version}),
|
|||
mariadb-server-5.2,
|
||||
mariadb-server-5.3,
|
||||
mariadb-server-5.5,
|
||||
mysql-client-5.5 (<< ${source:Version}),
|
||||
mysql-client-5.6 (<< ${source:Version}),
|
||||
mysql-client-5.7 (<< ${source:Version}),
|
||||
mysql-client-8.0 (<< ${source:Version}),
|
||||
mysql-server (<< ${source:Version}),
|
||||
mysql-client-5.5,
|
||||
mysql-client-5.6,
|
||||
mysql-client-5.7,
|
||||
mysql-client-8.0,
|
||||
mysql-client-core-8.0,
|
||||
mysql-server,
|
||||
mysql-server-4.1,
|
||||
mysql-server-5.0,
|
||||
mysql-server-5.1,
|
||||
|
@ -532,6 +533,10 @@ Conflicts: mariadb-server (<< ${source:Version}),
|
|||
mysql-server-5.6,
|
||||
mysql-server-5.7,
|
||||
mysql-server-8.0,
|
||||
mysql-server-core-5.5,
|
||||
mysql-server-core-5.6,
|
||||
mysql-server-core-5.7,
|
||||
mysql-server-core-8.0,
|
||||
virtual-mysql-server
|
||||
Replaces: libmariadbclient-dev (<< 5.5.0),
|
||||
libmariadbclient16,
|
||||
|
@ -546,11 +551,12 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
|
|||
mariadb-server-5.2,
|
||||
mariadb-server-5.3,
|
||||
mariadb-server-5.5,
|
||||
mysql-client-5.5 (<< ${source:Version}),
|
||||
mysql-client-5.6 (<< ${source:Version}),
|
||||
mysql-client-5.7 (<< ${source:Version}),
|
||||
mysql-client-8.0 (<< ${source:Version}),
|
||||
mysql-server (<< ${source:Version}),
|
||||
mysql-client-5.5,
|
||||
mysql-client-5.6,
|
||||
mysql-client-5.7,
|
||||
mysql-client-8.0,
|
||||
mysql-client-core-8.0,
|
||||
mysql-server,
|
||||
mysql-server-4.1,
|
||||
mysql-server-5.0,
|
||||
mysql-server-5.1,
|
||||
|
@ -784,6 +790,9 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
|
|||
${misc:Depends},
|
||||
${perl:Depends},
|
||||
${shlibs:Depends}
|
||||
Conflicts: mariadb-server-5.5,
|
||||
mysql-server-5.7,
|
||||
mysql-server-core-8.0
|
||||
Breaks: mariadb-server-5.5,
|
||||
mariadb-test-10.0,
|
||||
mariadb-test-10.1,
|
||||
|
@ -792,19 +801,18 @@ Breaks: mariadb-server-5.5,
|
|||
mariadb-test-10.4,
|
||||
mariadb-test-5.5,
|
||||
mysql-server-5.7,
|
||||
mysql-server-core-8.0,
|
||||
mysql-testsuite,
|
||||
mysql-testsuite-5.5,
|
||||
mysql-testsuite-5.6,
|
||||
mysql-testsuite-5.7,
|
||||
mysql-testsuite-8.0
|
||||
Replaces: mariadb-server-5.5,
|
||||
mariadb-test-10.0,
|
||||
Replaces: mariadb-test-10.0,
|
||||
mariadb-test-10.1,
|
||||
mariadb-test-10.2,
|
||||
mariadb-test-10.3,
|
||||
mariadb-test-10.4,
|
||||
mariadb-test-5.5,
|
||||
mysql-server-5.7,
|
||||
mysql-testsuite,
|
||||
mysql-testsuite-5.5,
|
||||
mysql-testsuite-5.6,
|
||||
|
|
5
debian/salsa-ci.yml
vendored
5
debian/salsa-ci.yml
vendored
|
@ -123,11 +123,6 @@ build native deb:
|
|||
ccache -s
|
||||
mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
|
||||
|
||||
# Temporarily ignore until https://github.com/MariaDB/server/pull/1729 is merged
|
||||
missing-breaks:
|
||||
extends: .test-missing-breaks
|
||||
allow_failure: true
|
||||
|
||||
piuparts:
|
||||
extends: .test-piuparts
|
||||
stage: test extras
|
||||
|
|
Loading…
Add table
Reference in a new issue