[Pkg-mysql-commits] [mariadb-5.5] 01/01: Fixed multiple issues reported by Lintian

Fri Apr 18 21:28:35 UTC 2014

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 85ded4feb69c59d58897ccf54e6e08ca69a5bad8
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Apr 18 22:52:58 2014 +0300

    Fixed multiple issues reported by Lintian
---
 debian/libmariadbclient-dev.install              |  4 +++-
 debian/libmariadbclient18.lintian-overrides      |  3 ++-
 debian/libmariadbd-dev.lintian-overrides         |  5 +++++
 debian/mariadb-client-5.5.lintian-overrides      |  7 -------
 debian/mariadb-server-5.5.lintian-overrides      | 14 +-------------
 debian/mariadb-server-core-5.5.lintian-overrides |  1 +
 debian/mariadb-test-5.5.lintian-overrides        | 10 +---------
 debian/source.lintian-overrides                  |  8 ++++++++
 8 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install
index b18f2d5..4e4ad0a 100644
--- a/debian/libmariadbclient-dev.install
+++ b/debian/libmariadbclient-dev.install
@@ -1,6 +1,8 @@
 usr/bin/mysql_config
-usr/include/mysql
+usr/include/mysql/*
 usr/lib/*/libmariadbclient.a
+usr/lib/*/libmariadbclient.so
 usr/lib/*/libmariadbclient_r.a
+usr/lib/*/libmariadbclient_r.so*
 usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
diff --git a/debian/libmariadbclient18.lintian-overrides b/debian/libmariadbclient18.lintian-overrides
index 6252cc1..e2121e5 100644
--- a/debian/libmariadbclient18.lintian-overrides
+++ b/debian/libmariadbclient18.lintian-overrides
@@ -1,7 +1,8 @@
-# Ok as long as file names don't conflict with the MySQL version
+# OK, file names don't conflict with the MySQL version
 libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/dialog.so
 libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/mysql_clear_password.so
 # embedded libs are OK
 libmariadbclient18: embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
+libmariadbclient18: embedded-library usr/lib/i386-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
 # OK, newer Debian should support xz
 libmariadbclient18: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index d7fbc83..6dc008d 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,5 +1,10 @@
 # These are OK for -dev package
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
+# OK to have embedded from same source
 libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
+libmariadbd-dev: embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient
+# This is indeed a -dev package
+libmariadbd-dev: non-dev-pkg-with-shlib-symlink usr/lib/i386-linux-gnu/libmysqld.so.18 usr/lib/i386-linux-gnu/libmysqld.so
+libmariadbd-dev: non-dev-pkg-with-shlib-symlink usr/lib/x86_64-linux-gnu/libmysqld.so.18 usr/lib/x86_64-linux-gnu/libmysqld.so
 # OK, newer Debian should support xz
 libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
index a33259f..aad2591 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -1,10 +1,3 @@
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqladmin.1.gz 28: warning [p 1, 1.5i]: can't break line
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqldump.1.gz 2047: warning [p 12, 1.3i, div `3tbd2,1', 0.2i]: can't break line
-mariadb-client-5.5: manpage-has-errors-from-man usr/share/man/man8/mysqlmanager.8.gz 1509: warning [p 11, 4.8i, div `3tbd7,1', 5.2i]: can't break line
-mariadb-client-5.5: binary-without-manpage usr/bin/innochecksum
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqlanalyze
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqloptimize
-mariadb-client-5.5: binary-without-manpage usr/bin/mysqlrepair
 # embedded libs are OK
 mariadb-client-5.5: embedded-library usr/bin/mysqladmin: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqldump: libmysqlclient
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 3a724d0..fa1ce57 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -1,16 +1,4 @@
+# Embedded from same source is OK
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/auth_pam.so
-mariadb-server-5.5: hardening-no-fortify-functions usr/lib/mysql/plugin/dialog.so
-mariadb-server-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqlbinlog.1.gz 1313: warning [p 9, 1.8i, div `3tbd3,2', 0.8i]: can't break line
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_chk
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_dump_log
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_ftdump
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_pack
-mariadb-server-5.5: binary-without-manpage usr/bin/aria_read_log
-mariadb-server-5.5: binary-without-manpage usr/bin/mysql_plugin
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:146 /bin/bash
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:194 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:208 /bin/echo
-mariadb-server-5.5: command-with-path-in-maintainer-script postinst:216 /bin/echo
 # OK in neẃer Debian, includes support for xz
 mariadb-server-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server-core-5.5.lintian-overrides b/debian/mariadb-server-core-5.5.lintian-overrides
index bc0f142..e7f9206 100644
--- a/debian/mariadb-server-core-5.5.lintian-overrides
+++ b/debian/mariadb-server-core-5.5.lintian-overrides
@@ -1,3 +1,4 @@
+# Embedded with same source OK
 mariadb-server-core-5.5: embedded-library usr/sbin/mysqld: libmysqlclient
 # OK in neẃer Debian, includes support for xz
 mariadb-server-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index 40ae3e1..7a7053e 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -1,15 +1,7 @@
 # in modern Debian this xz support exists, this should not matter anymore
 mariadb-test-5.5: data.tar.xz-member-without-dpkg-pre-depends
-# Ask help from upstream to fix these later
+# Embedded from same source is OK
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmysqlclient
 mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmysqlclient
-mariadb-test-5.5: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/std_data/checkDBI_DBD-mysql.pl
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/long_tmpdir-master.sh
-mariadb-test-5.5: script-not-executable usr/share/mysql/mysql-test/t/lowercase_mixed_tmpdir-master.sh
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world_schema.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/include/world.inc
-mariadb-test-5.5: executable-not-elf-or-script usr/share/mysql/mysql-test/collections/default.weekly
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index aff65fe..67e9736 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1 +1,9 @@
 maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm
+# File is multi-licensed, and thus should be ok for Debian
+license-problem-non-free-RFC include/sha1.h
+license-problem-non-free-RFC include/sha1.c
+# Autotools is not used, these files are just old cruft from upstream
+outdated-autotools-helper-file extra/jemalloc/config.guess
+outdated-autotools-helper-file extra/jemalloc/config.sub
+outdated-autotools-helper-file storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess
+outdated-autotools-helper-file storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git

