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

[Otto Kekäläinen]

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 672543a6847bdaed2ed75cf4fd540628806be6d0
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Fri Apr 18 22:52:58 2014 +0300

    Fixed multiple Lintian reported minor issues
---
 debian/libmariadbclient-dev.install         |  4 +++-
 debian/libmariadbclient18.lintian-overrides |  9 +++++----
 debian/libmariadbd-dev.lintian-overrides    | 10 +++++++---
 debian/source.lintian-overrides             |  8 ++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install
index b18f2d5..d814ac3 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..d0380cd 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
-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
+arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/dialog.so
+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
+embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
+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
+data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index d7fbc83..f2f48bc 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,5 +1,9 @@
 # These are OK for -dev package
-libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
+package-name-doesnt-match-sonames libmysqld18
+embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
+embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient
+# This is indeed a -dev package
+non-dev-pkg-with-shlib-symlink usr/lib/i386-linux-gnu/libmysqld.so.18 usr/lib/i386-linux-gnu/libmysqld.so
+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
+data.tar.xz-member-without-dpkg-pre-depends
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