[Pkg-mysql-commits] [mariadb-5.5] 01/03: Minor Lintian warning fixes and double checked overrides

[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 6557c19f869ebf57dd3ef1c896ca63e49dbcee9a
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Sat Apr 26 15:34:02 2014 +0300

    Minor Lintian warning fixes and double checked overrides
---
 debian/libmariadbd-dev.lintian-overrides    |  4 ++++
 debian/mariadb-server-5.5.lintian-overrides |  6 +++---
 debian/source.lintian-overrides             | 15 +++++++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index da21d8c..4664942 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -5,3 +5,7 @@ libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libm
 libmariadbd-dev: embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient
 # OK, newer Debian should support xz
 libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
+# OK, this is in fact a dev package
+# but for soname libmysqlclient
+# (due to upstream reasons)
+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
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 09cfbf0..e40c340 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -3,8 +3,8 @@ 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
+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
 # 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/source.lintian-overrides b/debian/source.lintian-overrides
index 67e9736..ba28d40 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,9 +1,12 @@
+# The mysql-server-5.6.postrm script handles
+# what debhelper normally would.
+# This is apparently related to #526464.
 maintainer-script-lacks-debhelper-token debian/mariadb-server-5.5.postrm
-# File is multi-licensed, and thus should be ok for Debian
+# 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
+license-problem-non-free-RFC mysys/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
+outdated-autotools-helper-file extra/jemalloc/config.guess 2012-02-10
+outdated-autotools-helper-file extra/jemalloc/config.sub 2012-02-10
+outdated-autotools-helper-file storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.guess 2009-04-27
+outdated-autotools-helper-file storage/tokudb/ft-index/third_party/xz-4.999.9beta/build-aux/config.sub 2009-04-17

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