Skip to content

Commit ddefc59

Browse files
illuusiogrooverdan
authored andcommitted
MDEV-33837: Fix some miscellaneous lintian warnings
These are not big ones. These are needed in *BSD family * incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mariadb-stress-test.pl] * incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mariadb-test-run.pl] and these are needed to make sure that these packages get removed if they exist: * version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:*] * version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:*] * version-substvar-for-external-package Replaces ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:*]
1 parent cfec45d commit ddefc59

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Mainly for BSD family to make sure that perl is found
2+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/bin/mytop]

debian/mariadb-test.lintian-overrides

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ arch-dependent-file-in-usr-share [usr/share/mysql/mysql-test/lib/My/SafeProcess/
44
# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
55
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl]
66
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl]
7-
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-stress-test.pl]
8-
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-test-run.pl]
7+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mariadb-stress-test.pl]
8+
incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mariadb-test-run.pl]
9+
910
# These libraries are ok not have any other dependencies than itself and MariaDB server
1011
shared-library-lacks-prerequisites [usr/lib/mysql/plugin/auth_0x0100.so]
1112
shared-library-lacks-prerequisites [usr/lib/mysql/plugin/debug_key_management.so]

debian/source/lintian-overrides

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
mariadb source: package-uses-deprecated-debhelper-compat-version 9
33
# Necessary for drop-in-place-replacement upgrades on mysql-server/-client
44
# since package breaks/replaces these but at the same time also provides them
5-
version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:74]
6-
version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:74]
7-
# These are left for reason version-substvar-for-external-package
85
version-substvar-for-external-package Conflicts ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [*]
96
version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev-compat -> libmariadbclient-dev [*]
107
# New Lintian syntax (from version 2.115)
@@ -14,3 +11,7 @@ missing-build-dependency-for-dh-addon systemd (does not satisfy debhelper:any (>
1411
# Should in some point reviewd what should we done
1512
dependency-is-not-multi-archified libmariadb-dev-compat depends on libmariadb-dev (multi-arch: no)
1613
dependency-is-not-multi-archified mariadb-plugin-gssapi-client depends on mariadb-client (multi-arch: no)
14+
# These are for purpose
15+
version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqlclient-dev [debian/control:*]
16+
version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev -> libmysqld-dev [debian/control:*]
17+
version-substvar-for-external-package Replaces ${source:Version} libmariadbd-dev -> libmariadbclient-dev [debian/control:*]

0 commit comments

Comments
 (0)