From 851816532b39b4bf04b1d352cf3c28929ec99cf1 Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Tue, 20 Sep 2022 09:52:44 +0300 Subject: [PATCH] MDEV-28834: Add minimal support for Lintian version 2.115 and above Convert minimal amount of Lintian overrides to make Lintian test pass also with Debian Sid latest Lintian 2.115 version. Old style overrides are kept so they can be used with older versions of Lintian. Introduce minimal Lintian overrides which are common from MariaDB version 10.5 up-to to 10.8. Overrides added files: * debian/mariadb-test-data.lintian-overrides - MariaDB installs some shared objects to test-suite directory and not in '/usr/lib' or similar. Share objects is pam_mariadb_mtr.so. Tags are arch-dependent-file-in-usr-share and arch-independent-package-contains-binary-or-object Lintia * debian/mariadb-test.lintian-overrides - MariaDB installs some some binaries to test-sute directory and in mariadb-test package they are my_safe_process and wsrep_check_version. Tags is arch-dependent-file-in-usr-share * debian/source/lintian-overrides - In source there is some source files missing which should be addressed sql/share/charsets/languages.html and and storage/rocksdb/rocksdb/docs/_includes/footer.html. Tags is source-is-missing - Add Lintian override for missing: storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2 - Add Lintian override for substvar external resources: ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:66] ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:66] ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:216] --- debian/mariadb-test-data.lintian-overrides | 2 ++ debian/mariadb-test.lintian-overrides | 2 ++ debian/source/lintian-overrides | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides index 2fb5bc6e604..55058ee3c35 100644 --- a/debian/mariadb-test-data.lintian-overrides +++ b/debian/mariadb-test-data.lintian-overrides @@ -1,6 +1,8 @@ # These should be moved, see https://jira.mariadb.org/browse/MDEV-21654 arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so +arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so] arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so +arch-independent-package-contains-binary-or-object [usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so] # Mainly for support for *BSD family. Not right way to do but this is test package and not for production incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl] incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl] diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides index b9f45b862b5..5bac3d60cac 100644 --- a/debian/mariadb-test.lintian-overrides +++ b/debian/mariadb-test.lintian-overrides @@ -1,6 +1,8 @@ # These should be moved, see https://jira.mariadb.org/browse/MDEV-21653 arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version +arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process] +arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version] # Mainly for support for *BSD family. Not right way to do but this is test package and not for production incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl] incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl] diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 2fab3096024..d0aa421cd33 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -11,12 +11,20 @@ version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2 +source-is-missing [storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2] # Must be fixed upstream source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-*.custom.js +# New Lintian syntax (from version 2.115) +source-is-missing [sql/share/charsets/languages.html] +source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html] # Intentional control relationships version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev +# New Lintian syntax (from version 2.115) +version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev [debian/control:*] +version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev [debian/control:*] +version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev [debian/control:*] # We can't change build dependencies on a stable branch (10.5..10.8) so just override this missing-build-dependency-for-dh-addon systemd * # Data or test files where long lines are justified