Skip to content

M
MariaDB
Commit 9ed7e967 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Vicențiu-Marian Ciorbaru
Browse files
Options

MDEV-6284: Sync breaks/replaces relationships and file locations 

These changes are in line with what has been changes in downstream Debian
and they fix the following errors:

 $ check_for_missing_breaks_replaces.py -o ${WORKING_DIR}/missing_breaks.xml --changes-file ${WORKING_DIR}/*.changes
 [ERROR] mariadb-client-10.5 conflicts with mytop files: {'/usr/bin/mytop'}
 [ERROR] mariadb-client-10.5 conflicts with mariadb-client-core-10.3 files: {'/usr/bin/mysqlcheck'}
 [ERROR] mariadb-server-10.5 conflicts with mariadb-server-core-10.3 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/bin/resolveip', '/usr/share/mysql/mysql_test_data_timezone.sql'}
 [ERROR] mariadb-client-10.5 conflicts with mysql-client-core-5.7 files: {'/usr/bin/mysqlcheck'} [ERROR] mariadb-server-10.5 conflicts with mariadb-server-core-10.3 files: {'/usr/share/man/man1/resolveip.1.gz', '/usr/bin/resolveip', '/usr/share/mysql/mysql_test_data_timezone.sql'}
 [ERROR] mariadb-server-10.5 conflicts with mysql-client-5.7 files: {'/usr/bin/myisam_ftdump', '/usr/share/man/man1/myisam_ftdump.1.gz'}
 [ERROR] mariadb-server-core-10.5 conflicts with mysql-server-5.7 files: {'/usr/share/mysql/mysql_test_data_timezone.sql', '/usr/bin/resolveip', '/usr/share/man/man1/resolveip.1.gz'}
 [ERROR] mariadb-test conflicts with mysql-server-5.7 files: {'/usr/lib/mysql/plugin/adt_null.so', '/usr/lib/mysql/plugin/mypluglib.so'}
parent 7a0eeaaf
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 5 deletions
debian/control
View file @ 9ed7e967
......@@ -4,8 +4,8 @@ Priority: optional
Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
Build-Depends: bison,
chrpath,
debhelper (>= 9),
cmake,
debhelper (>= 9),
dh-apparmor,
dh-exec,
dh-systemd,
......@@ -347,7 +347,20 @@ Conflicts: mariadb-client (<< ${source:Version}),
mysql-client-5.6,
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}),
mytop,
virtual-mysql-client
Breaks: mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
mariadb-client-core-10.3,
mariadb-client-core-10.4,
mariadb-client-core-10.5 (<< ${source:Version})
Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-10.0,
mariadb-client-10.1,
......@@ -359,6 +372,12 @@ Replaces: mariadb-client (<< ${source:Version}),
mariadb-client-5.2,
mariadb-client-5.3,
mariadb-client-5.5,
mariadb-client-core-10.0,
mariadb-client-core-10.1,
mariadb-client-core-10.2,
mariadb-client-core-10.3,
mariadb-client-core-10.4,
mariadb-client-core-10.5 (<< ${source:Version}),
mariadb-server-10.5 (<< ${source:Version}),
mysql-client (<< 5.0.51),
mysql-client-5.0,
......@@ -367,6 +386,13 @@ Replaces: mariadb-client (<< ${source:Version}),
mysql-client-5.6,
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}),
mytop,
virtual-mysql-client
Provides: default-mysql-client,
mysql-client,
......@@ -417,7 +443,10 @@ Breaks: mariadb-client-10.0,
mariadb-client-10.5 (<< ${source:Version}),
mariadb-server-10.3,
mariadb-server-10.4,
mariadb-server-10.5 (<< ${source:Version})
mariadb-server-10.5 (<< ${source:Version}),
mysql-server-5.6,
mysql-server-5.7,
mysql-server-8.0
Replaces: mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
......@@ -437,6 +466,9 @@ Replaces: mariadb-client-10.0,
mariadb-server-core-5.3,
mariadb-server-core-5.5,
mysql-server-5.0,
mysql-server-5.6,
mysql-server-5.7,
mysql-server-8.0,
mysql-server-core-5.0,
mysql-server-core-5.1,
mysql-server-core-5.5,
......@@ -500,6 +532,10 @@ Conflicts: mariadb-server (<< ${source:Version}),
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-10.2,
mariadb-tokudb-engine-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-server-4.1,
mysql-server-5.0,
......@@ -526,6 +562,10 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
mariadb-tokudb-engine-10.1,
mariadb-tokudb-engine-10.2,
mariadb-tokudb-engine-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-server-4.1,
mysql-server-5.0,
......@@ -799,6 +839,7 @@ Breaks: mariadb-server-5.5,
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,
......@@ -811,6 +852,7 @@ Replaces: mariadb-server-5.5,
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,
......
debian/mariadb-server-10.5.install
View file @ 9ed7e967
......@@ -34,7 +34,6 @@ usr/bin/myisampack
usr/bin/perror
usr/bin/replace
usr/bin/resolve_stack_dump
usr/bin/resolveip
usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
......@@ -96,11 +95,9 @@ usr/share/man/man1/mysqlhotcopy.1
usr/share/man/man1/perror.1
usr/share/man/man1/replace.1
usr/share/man/man1/resolve_stack_dump.1
usr/share/man/man1/resolveip.1
usr/share/man/man1/wsrep_sst_common.1
usr/share/man/man1/wsrep_sst_mariabackup.1
usr/share/man/man1/wsrep_sst_mysqldump.1
usr/share/man/man1/wsrep_sst_rsync.1
usr/share/mysql/errmsg-utf8.txt
usr/share/mysql/mysql_test_data_timezone.sql
usr/share/mysql/wsrep_notify
debian/mariadb-server-core-10.5.install
View file @ 9ed7e967
......@@ -2,6 +2,7 @@ usr/bin/innochecksum
usr/bin/mariadb-install-db
usr/bin/mariadb-upgrade
usr/bin/my_print_defaults
usr/bin/resolveip
usr/sbin/mariadbd
usr/share/man/man1/innochecksum.1
usr/share/man/man1/mariadb-install-db.1
......@@ -9,6 +10,7 @@ usr/share/man/man1/mariadb-upgrade.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1
usr/share/man/man1/resolveip.1
usr/share/man/man8/mariadbd.8
usr/share/man/man8/mysqld.8
usr/share/mysql/charsets
......@@ -30,6 +32,7 @@ usr/share/mysql/maria_add_gis_sp_bootstrap.sql
usr/share/mysql/mysql_performance_tables.sql
usr/share/mysql/mysql_system_tables.sql
usr/share/mysql/mysql_system_tables_data.sql
usr/share/mysql/mysql_test_data_timezone.sql
usr/share/mysql/mysql_test_db.sql
usr/share/mysql/norwegian
usr/share/mysql/norwegian-ny
......
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