[Pkg-mysql-commits] [mariadb-5.5] 07/08: Fixed some Lintian warnings

[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 c3987cdae4815f4490f3bac883e81bbe9399144b
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Apr 17 22:23:16 2014 +0300

    Fixed some Lintian warnings
---
 debian/libmariadbd-dev.lintian-overrides                      | 1 -
 debian/mariadb-server-5.5.dirs                                | 2 --
 debian/mariadb-test-5.5.lintian-overrides                     | 5 -----
 debian/patches/82_extend_default_test_timeout_for_tokudb.diff | 2 ++
 debian/patches/99_remove_rename_mariadb-server_files_in.diff  | 2 ++
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index e2c9d5c..d7fbc83 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,6 +1,5 @@
 # These are OK for -dev package
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-libmariadbd-dev: no-shlibs-control-file usr/lib/x86_64-linux-gnu/libmysqld.so.18
 libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
 # OK, newer Debian should support xz
 libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server-5.5.dirs b/debian/mariadb-server-5.5.dirs
index a234d5f..e23e5b0 100644
--- a/debian/mariadb-server-5.5.dirs
+++ b/debian/mariadb-server-5.5.dirs
@@ -2,8 +2,6 @@ etc/init.d
 etc/logrotate.d
 etc/mysql/conf.d
 usr/bin
-usr/sbin
-usr/share/man/man8
 usr/share/mysql
 usr/share/doc/mariadb-server-5.5
 var/lib/mysql-upgrade
diff --git a/debian/mariadb-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index 7f5b5ec..40ae3e1 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -1,8 +1,3 @@
-# OK to have embedded libraries in test suite
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmariadbclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmariadbclient
 # 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
diff --git a/debian/patches/82_extend_default_test_timeout_for_tokudb.diff b/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
index d139c3a..3c75a35 100644
--- a/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
+++ b/debian/patches/82_extend_default_test_timeout_for_tokudb.diff
@@ -1,3 +1,5 @@
+## DP: TokuDB tests can take very long on slow pbuilder/sbuild chroots, so extend time
+
 --- old/mysql-test/CMakeLists.txt	2014-02-12 17:55:23.469136898 +0200
 +++ new/mysql-test/CMakeLists.txt	2014-02-12 17:54:07.471406742 +0200
 @@ -64,7 +64,7 @@
diff --git a/debian/patches/99_remove_rename_mariadb-server_files_in.diff b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
index c08b789..a0383f8 100755
--- a/debian/patches/99_remove_rename_mariadb-server_files_in.diff
+++ b/debian/patches/99_remove_rename_mariadb-server_files_in.diff
@@ -1,3 +1,5 @@
+## DP: Remove hackish upstream manipulation of debian/* contents
+
 --- old/CMakeLists.txt	2014-01-29 20:55:56.499842093 +0200
 +++ new/CMakeLists.txt	2014-01-31 17:12:27.633594128 +0200
 @@ -431,12 +431,6 @@

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