Skip to content

Commit 5a4daa9

Browse files
ottokottok
committed
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
1 parent ab3777a commit 5a4daa9

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

‎debian/control

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Conflicts: mariadb-client-10.0,
278278
mysql-client (<< 5.0.51),
279279
mysql-client-5.0,
280280
mysql-client-5.1,
281-
mysql-client-5.5 (<< ${source:Version}),
281+
mysql-client-5.5,
282282
mysql-client-core-5.1,
283283
mysql-client-core-5.5,
284284
mysql-client-core-5.6,
@@ -351,11 +351,11 @@ Conflicts: mariadb-client (<< ${source:Version}),
351351
mysql-client-5.7,
352352
mysql-client-8.0,
353353
mysql-client-core-5.0,
354-
mysql-client-core-5.1 (<< ${source:Version}),
355-
mysql-client-core-5.5 (<< ${source:Version}),
356-
mysql-client-core-5.6 (<< ${source:Version}),
357-
mysql-client-core-5.7 (<< ${source:Version}),
358-
mysql-client-core-8.0 (<< ${source:Version}),
354+
mysql-client-core-5.1,
355+
mysql-client-core-5.5,
356+
mysql-client-core-5.6,
357+
mysql-client-core-5.7,
358+
mysql-client-core-8.0,
359359
mytop,
360360
virtual-mysql-client
361361
Breaks: mariadb-client-core-10.0,
@@ -390,11 +390,11 @@ Replaces: mariadb-client (<< ${source:Version}),
390390
mysql-client-5.7,
391391
mysql-client-8.0,
392392
mysql-client-core-5.0,
393-
mysql-client-core-5.1 (<< ${source:Version}),
394-
mysql-client-core-5.5 (<< ${source:Version}),
395-
mysql-client-core-5.6 (<< ${source:Version}),
396-
mysql-client-core-5.7 (<< ${source:Version}),
397-
mysql-client-core-8.0 (<< ${source:Version}),
393+
mysql-client-core-5.1,
394+
mysql-client-core-5.5,
395+
mysql-client-core-5.6,
396+
mysql-client-core-5.7,
397+
mysql-client-core-8.0,
398398
mytop,
399399
virtual-mysql-client
400400
Provides: default-mysql-client,
@@ -520,18 +520,23 @@ Conflicts: mariadb-server (<< ${source:Version}),
520520
mariadb-server-5.2,
521521
mariadb-server-5.3,
522522
mariadb-server-5.5,
523-
mysql-client-5.5 (<< ${source:Version}),
524-
mysql-client-5.6 (<< ${source:Version}),
525-
mysql-client-5.7 (<< ${source:Version}),
526-
mysql-client-8.0 (<< ${source:Version}),
527-
mysql-server (<< ${source:Version}),
523+
mysql-client-5.5,
524+
mysql-client-5.6,
525+
mysql-client-5.7,
526+
mysql-client-8.0,
527+
mysql-client-core-8.0,
528+
mysql-server,
528529
mysql-server-4.1,
529530
mysql-server-5.0,
530531
mysql-server-5.1,
531532
mysql-server-5.5,
532533
mysql-server-5.6,
533534
mysql-server-5.7,
534535
mysql-server-8.0,
536+
mysql-server-core-5.5,
537+
mysql-server-core-5.6,
538+
mysql-server-core-5.7,
539+
mysql-server-core-8.0,
535540
virtual-mysql-server
536541
Replaces: libmariadbclient-dev (<< 5.5.0),
537542
libmariadbclient16,
@@ -546,11 +551,12 @@ Replaces: libmariadbclient-dev (<< 5.5.0),
546551
mariadb-server-5.2,
547552
mariadb-server-5.3,
548553
mariadb-server-5.5,
549-
mysql-client-5.5 (<< ${source:Version}),
550-
mysql-client-5.6 (<< ${source:Version}),
551-
mysql-client-5.7 (<< ${source:Version}),
552-
mysql-client-8.0 (<< ${source:Version}),
553-
mysql-server (<< ${source:Version}),
554+
mysql-client-5.5,
555+
mysql-client-5.6,
556+
mysql-client-5.7,
557+
mysql-client-8.0,
558+
mysql-client-core-8.0,
559+
mysql-server,
554560
mysql-server-4.1,
555561
mysql-server-5.0,
556562
mysql-server-5.1,
@@ -784,6 +790,9 @@ Depends: mariadb-client-10.5 (= ${binary:Version}),
784790
${misc:Depends},
785791
${perl:Depends},
786792
${shlibs:Depends}
793+
Conflicts: mariadb-server-5.5,
794+
mysql-server-5.7,
795+
mysql-server-core-8.0
787796
Breaks: mariadb-server-5.5,
788797
mariadb-test-10.0,
789798
mariadb-test-10.1,
@@ -792,19 +801,18 @@ Breaks: mariadb-server-5.5,
792801
mariadb-test-10.4,
793802
mariadb-test-5.5,
794803
mysql-server-5.7,
804+
mysql-server-core-8.0,
795805
mysql-testsuite,
796806
mysql-testsuite-5.5,
797807
mysql-testsuite-5.6,
798808
mysql-testsuite-5.7,
799809
mysql-testsuite-8.0
800-
Replaces: mariadb-server-5.5,
801-
mariadb-test-10.0,
810+
Replaces: mariadb-test-10.0,
802811
mariadb-test-10.1,
803812
mariadb-test-10.2,
804813
mariadb-test-10.3,
805814
mariadb-test-10.4,
806815
mariadb-test-5.5,
807-
mysql-server-5.7,
808816
mysql-testsuite,
809817
mysql-testsuite-5.5,
810818
mysql-testsuite-5.6,

‎debian/salsa-ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ build native deb:
123123
ccache -s
124124
mv ${CCACHE_TMP_DIR} ${CCACHE_WORK_DIR}
125125

126-
# Temporarily ignore until https://github.com/MariaDB/server/pull/1729 is merged
127-
missing-breaks:
128-
extends: .test-missing-breaks
129-
allow_failure: true
130-
131126
piuparts:
132127
extends: .test-piuparts
133128
stage: test extras

0 commit comments

Comments
 (0)