From 8f87f9c745b46ab60c6b5b530d23c52d9e35988f Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Tue, 14 May 2024 11:54:18 +0300 Subject: [PATCH] MDEV-33837: Remove conflicts warnings from lintian Some packages are needed to conflict packages that are not in this package and they emerge some warnings. Remove them from lintian output as they are not errors or something that should be handled. I: libmariadb-dev: conflicts-with-version libmariadb-dev-compat (<< 3.0.0) I: libmariadb-dev-compat: conflicts-with-version libmariadbclient-dev (<< 1:10.11.8+maria~deb11) I: libmariadb3: conflicts-with-version libmariadbclient18 (<< 10.2.0) I: mariadb-client: conflicts-with-version mysql-client (<< 5.0.51) I: mariadb-client-core: conflicts-with-version mysql-client (<< 5.0.51) --- debian/libmariadb-dev-compat.lintian-overrides | 2 ++ debian/libmariadb-dev.lintian-overrides | 3 +++ debian/libmariadb3.lintian-overrides | 2 ++ debian/mariadb-client-core.lintian-overrides | 2 ++ debian/mariadb-client.lintian-overrides | 3 +++ 5 files changed, 12 insertions(+) create mode 100644 debian/libmariadb-dev-compat.lintian-overrides create mode 100644 debian/libmariadb3.lintian-overrides create mode 100644 debian/mariadb-client-core.lintian-overrides diff --git a/debian/libmariadb-dev-compat.lintian-overrides b/debian/libmariadb-dev-compat.lintian-overrides new file mode 100644 index 00000000000..0c0aae31573 --- /dev/null +++ b/debian/libmariadb-dev-compat.lintian-overrides @@ -0,0 +1,2 @@ +# Needed conflict +conflicts-with-version libmariadbclient-dev (<< 1:10.11.8+maria~deb11) diff --git a/debian/libmariadb-dev.lintian-overrides b/debian/libmariadb-dev.lintian-overrides index be6933d7678..d89aa6deedf 100644 --- a/debian/libmariadb-dev.lintian-overrides +++ b/debian/libmariadb-dev.lintian-overrides @@ -1,6 +1,9 @@ # This is how upstream does it, wont' fix arch-dependent-file-not-in-arch-specific-directory usr/bin/mariadb_config +# Needed conflict +conflicts-with-version libmariadb-dev-compat (<< 3.0.0) + # Probably fixed in newer pandoc # man pages should be regenerated groff-message an.tmac::*: tbl preprocessor failed, or it or soelim was not run; table(s) likely not rendered (TE macro called with TW register undefined) [usr/share/man/man3/mysql_stmt_attr_set.3.gz:20] diff --git a/debian/libmariadb3.lintian-overrides b/debian/libmariadb3.lintian-overrides new file mode 100644 index 00000000000..1835a046c08 --- /dev/null +++ b/debian/libmariadb3.lintian-overrides @@ -0,0 +1,2 @@ +# Needed conflict +conflicts-with-version libmariadbclient18 (<< 10.2.0) diff --git a/debian/mariadb-client-core.lintian-overrides b/debian/mariadb-client-core.lintian-overrides new file mode 100644 index 00000000000..aa1e02a5575 --- /dev/null +++ b/debian/mariadb-client-core.lintian-overrides @@ -0,0 +1,2 @@ +# Needed conflict +conflicts-with-version mysql-client (<< 5.0.51) diff --git a/debian/mariadb-client.lintian-overrides b/debian/mariadb-client.lintian-overrides index 26b60c6e537..36577b08ef6 100644 --- a/debian/mariadb-client.lintian-overrides +++ b/debian/mariadb-client.lintian-overrides @@ -3,3 +3,6 @@ incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/bin/mytop # Used to determine which shell we have. False-positive situation bash-term-in-posix-shell '`echo "testing\c"' [usr/bin/mariadb-secure-installation:191] + +# Needed outside conflict +conflicts-with-version mysql-client (<< 5.0.51)