Skip to content

M
MariaDB
Commit 5a4daa90 authored by Otto Kekäläinen's avatar Otto Kekäläinen
Browse files
Options

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:
https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/9b6a67b53c2adf1bb5497d8649eb079767419835
https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/f6d5545a0241de2cda81c878a157517b83378c04

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
parent ab3777a3
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 29 deletions
debian/control
View file @ 5a4daa90
...@@ -278,7 +278,7 @@ Conflicts: mariadb-client-10.0, ...@@ -278,7 +278,7 @@ Conflicts: mariadb-client-10.0,
mysql-client (<< 5.0.51), mysql-client (<< 5.0.51),
mysql-client-5.0, mysql-client-5.0,
mysql-client-5.1, mysql-client-5.1,
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5,
mysql-client-core-5.1, mysql-client-core-5.1,
mysql-client-core-5.5, mysql-client-core-5.5,
mysql-client-core-5.6, mysql-client-core-5.6,
...@@ -351,11 +351,11 @@ Conflicts: mariadb-client (<< ${source:Version}), ...@@ -351,11 +351,11 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-5.7, mysql-client-5.7,
mysql-client-8.0, mysql-client-8.0,
mysql-client-core-5.0, mysql-client-core-5.0,
mysql-client-core-5.1 (<< ${source:Version}), mysql-client-core-5.1,
mysql-client-core-5.5 (<< ${source:Version}), mysql-client-core-5.5,
mysql-client-core-5.6 (<< ${source:Version}), mysql-client-core-5.6,
mysql-client-core-5.7 (<< ${source:Version}), mysql-client-core-5.7,
mysql-client-core-8.0 (<< ${source:Version}), mysql-client-core-8.0,
mytop, mytop,
virtual-mysql-client virtual-mysql-client
Breaks: mariadb-client-core-10.0, Breaks: mariadb-client-core-10.0,
...@@ -390,11 +390,11 @@ Replaces: mariadb-client (<< ${source:Version}), ...@@ -390,11 +390,11 @@ Replaces: mariadb-client (<< ${source:Version}),
mysql-client-5.7, mysql-client-5.7,
mysql-client-8.0, mysql-client-8.0,
mysql-client-core-5.0, mysql-client-core-5.0,
mysql-client-core-5.1 (<< ${source:Version}), mysql-client-core-5.1,
mysql-client-core-5.5 (<< ${source:Version}), mysql-client-core-5.5,
mysql-client-core-5.6 (<< ${source:Version}), mysql-client-core-5.6,
mysql-client-core-5.7 (<< ${source:Version}), mysql-client-core-5.7,
mysql-client-core-8.0 (<< ${source:Version}), mysql-client-core-8.0,
mytop, mytop,
virtual-mysql-client virtual-mysql-client
Provides: default-mysql-client, Provides: default-mysql-client,
...@@ -520,11 +520,12 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -520,11 +520,12 @@ Conflicts: mariadb-server (<< ${source:Version}),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5, mariadb-server-5.5,
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5,
mysql-client-5.6 (<< ${source:Version}), mysql-client-5.6,
mysql-client-5.7 (<< ${source:Version}), mysql-client-5.7,
mysql-client-8.0 (<< ${source:Version}), mysql-client-8.0,
mysql-server (<< ${source:Version}), mysql-client-core-8.0,
mysql-server,
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-5.1, mysql-server-5.1,
...@@ -532,6 +533,10 @@ Conflicts: mariadb-server (<< ${source:Version}), ...@@ -532,6 +533,10 @@ Conflicts: mariadb-server (<< ${source:Version}),
mysql-server-5.6, mysql-server-5.6,
mysql-server-5.7, mysql-server-5.7,
mysql-server-8.0, 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 virtual-mysql-server
Replaces: libmariadbclient-dev (<< 5.5.0), Replaces: libmariadbclient-dev (<< 5.5.0),
libmariadbclient16, libmariadbclient16,
...@@ -546,11 +551,12 @@ Replaces: libmariadbclient-dev (<< 5.5.0), ...@@ -546,11 +551,12 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5, mariadb-server-5.5,
mysql-client-5.5 (<< ${source:Version}), mysql-client-5.5,
mysql-client-5.6 (<< ${source:Version}), mysql-client-5.6,
mysql-client-5.7 (<< ${source:Version}), mysql-client-5.7,
mysql-client-8.0 (<< ${source:Version}), mysql-client-8.0,
mysql-server (<< ${source:Version}), mysql-client-core-8.0,
mysql-server,
mysql-server-4.1, mysql-server-4.1,
mysql-server-5.0, mysql-server-5.0,
mysql-server-5.1, mysql-server-5.1,
...@@ -784,6 +790,9 @@ Depends: mariadb-client-10.5 (= ${binary:Version}), ...@@ -784,6 +790,9 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
${misc:Depends}, ${misc:Depends},
${perl:Depends}, ${perl:Depends},
${shlibs:Depends} ${shlibs:Depends}
Conflicts: mariadb-server-5.5,
mysql-server-5.7,
mysql-server-core-8.0
Breaks: mariadb-server-5.5, Breaks: mariadb-server-5.5,
mariadb-test-10.0, mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
...@@ -792,19 +801,18 @@ Breaks: mariadb-server-5.5, ...@@ -792,19 +801,18 @@ Breaks: mariadb-server-5.5,
mariadb-test-10.4, mariadb-test-10.4,
mariadb-test-5.5, mariadb-test-5.5,
mysql-server-5.7, mysql-server-5.7,
mysql-server-core-8.0,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
mysql-testsuite-5.7, mysql-testsuite-5.7,
mysql-testsuite-8.0 mysql-testsuite-8.0
Replaces: mariadb-server-5.5, Replaces: mariadb-test-10.0,
mariadb-test-10.0,
mariadb-test-10.1, mariadb-test-10.1,
mariadb-test-10.2, mariadb-test-10.2,
mariadb-test-10.3, mariadb-test-10.3,
mariadb-test-10.4, mariadb-test-10.4,
mariadb-test-5.5, mariadb-test-5.5,
mysql-server-5.7,
mysql-testsuite, mysql-testsuite,
mysql-testsuite-5.5, mysql-testsuite-5.5,
mysql-testsuite-5.6, mysql-testsuite-5.6,
......
debian/salsa-ci.yml
View file @ 5a4daa90
...@@ -123,11 +123,6 @@ build native deb: ...@@ -123,11 +123,6 @@ build native deb:
ccache -s ccache -s
mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR} 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: piuparts:
extends: .test-piuparts extends: .test-piuparts
stage: test extras stage: test extras
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7