[Pkg-mysql-commits] [mariadb-5.5] 01/01: Fixed Lintian 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 031ab5177e30126a5cad42729f633847fd41317a
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sat Apr 19 23:25:58 2014 +0300

    Fixed Lintian issues
---
 debian/libmariadbd-dev.lintian-overrides    |  3 ---
 debian/mariadb-client-5.5.lintian-overrides |  7 ++++++-
 debian/mariadb-server-5.5.lintian-overrides |  6 ++++++
 debian/mariadb-server-5.5.postinst          |  2 +-
 debian/mariadb-test-5.5.dirs                | 14 --------------
 debian/mariadb-test-5.5.lintian-overrides   |  2 ++
 6 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index 6dc008d..da21d8c 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -3,8 +3,5 @@ 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 aad2591..5ca29c6 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -1,4 +1,4 @@
-# embedded libs are OK
+# OK, embedded has same source
 mariadb-client-5.5: embedded-library usr/bin/mysqladmin: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqldump: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqlimport: libmysqlclient
@@ -6,3 +6,8 @@ mariadb-client-5.5: embedded-library usr/bin/mysqlshow: libmysqlclient
 mariadb-client-5.5: embedded-library usr/bin/mysqlslap: libmysqlclient
 # OK, newer Debian should support xz
 mariadb-client-5.5: data.tar.xz-member-without-dpkg-pre-depends
+# Symlink to mysqlcheck, which does have a manpage
+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
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index fa1ce57..09cfbf0 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -2,3 +2,9 @@
 mariadb-server-5.5: embedded-library usr/bin/mysqlbinlog: libmysqlclient
 # OK in neẃer Debian, includes support for xz
 mariadb-server-5.5: data.tar.xz-member-without-dpkg-pre-depends
+# ash's buildin has no "-e" so use /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:195 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:209 /bin/echo
+mariadb-server-5.5: command-with-path-in-maintainer-script postinst:217 /bin/echo
+# mysql_plugin is a symlink and does not need its own manpage
+mariadb-server-5.5: binary-without-manpage usr/bin/mysql_plugin
diff --git a/debian/mariadb-server-5.5.postinst b/debian/mariadb-server-5.5.postinst
index cb05f6e..11787b7 100644
--- a/debian/mariadb-server-5.5.postinst
+++ b/debian/mariadb-server-5.5.postinst
@@ -143,7 +143,7 @@ EOF
     # Debian: beware of the bashisms... 
     # Debian: can safely run on upgrades with existing databases 
     set +e
-    /bin/bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
+    bash /usr/bin/mysql_install_db --rpm --user=mysql 2>&1 | $ERR_LOGGER
     set -e
     
     ## On every reconfiguration the maintenance user is recreated.
diff --git a/debian/mariadb-test-5.5.dirs b/debian/mariadb-test-5.5.dirs
index ef62d2b..699aa51 100644
--- a/debian/mariadb-test-5.5.dirs
+++ b/debian/mariadb-test-5.5.dirs
@@ -19,13 +19,6 @@ usr/share/mysql/mysql-test/suite/parts
 usr/share/mysql/mysql-test/suite/parts/inc
 usr/share/mysql/mysql-test/suite/parts/t
 usr/share/mysql/mysql-test/suite/parts/r
-usr/share/mysql/mysql-test/suite/rpl_ndb
-usr/share/mysql/mysql-test/suite/rpl_ndb/t
-usr/share/mysql/mysql-test/suite/rpl_ndb/r
-usr/share/mysql/mysql-test/suite/bugs
-usr/share/mysql/mysql-test/suite/bugs/t
-usr/share/mysql/mysql-test/suite/bugs/r
-usr/share/mysql/mysql-test/suite/bugs/data
 usr/share/mysql/mysql-test/suite/rpl
 usr/share/mysql/mysql-test/suite/rpl/t
 usr/share/mysql/mysql-test/suite/rpl/r
@@ -47,11 +40,7 @@ usr/share/mysql/mysql-test/suite/jp/r
 usr/share/mysql/mysql-test/suite/jp/include
 usr/share/mysql/mysql-test/suite/jp/std_data
 usr/share/mysql/mysql-test/suite/ndb
-usr/share/mysql/mysql-test/suite/ndb/t
-usr/share/mysql/mysql-test/suite/ndb/r
 usr/share/mysql/mysql-test/suite/maria
-usr/share/mysql/mysql-test/suite/maria/t
-usr/share/mysql/mysql-test/suite/maria/r
 usr/share/mysql/mysql-test/suite/funcs_2
 usr/share/mysql/mysql-test/suite/funcs_2/lib
 usr/share/mysql/mysql-test/suite/funcs_2/t
@@ -63,9 +52,6 @@ usr/share/mysql/mysql-test/suite/binlog
 usr/share/mysql/mysql-test/suite/binlog/t
 usr/share/mysql/mysql-test/suite/binlog/r
 usr/share/mysql/mysql-test/suite/binlog/std_data
-usr/share/mysql/mysql-test/suite/ndb_team
-usr/share/mysql/mysql-test/suite/ndb_team/t
-usr/share/mysql/mysql-test/suite/ndb_team/r
 usr/share/mysql/mysql-test/suite/federated
 usr/share/mysql/mysql-test/suite/funcs_1
 usr/share/mysql/mysql-test/suite/funcs_1/cursors
diff --git a/debian/mariadb-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index 7a7053e..44a11d2 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -5,3 +5,5 @@ 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
+# OK, file part of test suite
+mariadb-test-5.5: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process

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