[Pkg-mysql-commits] [mariadb-5.5] 03/04: Fixed policy version and lintian errors

Otto Kekäläinen ottok-guest at moszumanska.debian.org
Tue Feb 4 17:52:51 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 92c705eb2f4c3d03cccf3b3aae24b8736269feab
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Tue Feb 4 15:53:02 2014 +0200

    Fixed policy version and lintian errors
---
 debian/control                                   |  2 +-
 debian/libmariadbclient18.lintian-overrides      |  7 +++++++
 debian/libmariadbd-dev.lintian-overrides         |  3 +++
 debian/mariadb-client-5.5.lintian-overrides      |  8 ++++++++
 debian/mariadb-client-core-5.5.lintian-overrides |  3 +++
 debian/mariadb-common.lintian-overrides          |  1 +
 debian/mariadb-server-5.5.lintian-overrides      |  2 ++
 debian/mariadb-test-5.5.lintian-overrides        | 13 +++++++++++++
 8 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 97c6e44..a050842 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Otto Kekäläinen <otto at seravo.fi>, Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>, James Page <jamespage at debian.org>
 Build-Depends: debhelper (>= 9), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-gplv2-dev, po-debconf, psmisc, chrpath, bison, lsb-release, hardening-wrapper, cmake, libssl-dev, libpam0g-dev, libboost1.48-dev | libboost1.49-dev | libboost1.54-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://mariadb.org/
 Vcs-Git: git://git.debian.org/git/pkg-mysql/mariadb-5.5.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mariadb-5.5.git
diff --git a/debian/libmariadbclient18.lintian-overrides b/debian/libmariadbclient18.lintian-overrides
new file mode 100644
index 0000000..6252cc1
--- /dev/null
+++ b/debian/libmariadbclient18.lintian-overrides
@@ -0,0 +1,7 @@
+# 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
+# embedded libs are OK
+libmariadbclient18: embedded-library usr/lib/x86_64-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 40cf761..e2c9d5c 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,3 +1,6 @@
+# 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-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
index 1581ccb..a33259f 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -5,3 +5,11 @@ 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
+mariadb-client-5.5: embedded-library usr/bin/mysqlimport: libmysqlclient
+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
diff --git a/debian/mariadb-client-core-5.5.lintian-overrides b/debian/mariadb-client-core-5.5.lintian-overrides
index 205871d..2f8573a 100644
--- a/debian/mariadb-client-core-5.5.lintian-overrides
+++ b/debian/mariadb-client-core-5.5.lintian-overrides
@@ -1,2 +1,5 @@
+# these libs are OK
+mariadb-client-core-5.5: embedded-library usr/bin/mysql: libmysqlclient
+mariadb-client-core-5.5: embedded-library usr/bin/mysqlcheck: libmysqlclient
 # OK in neẃer Debian, includes support for xz
 mariadb-client-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-common.lintian-overrides b/debian/mariadb-common.lintian-overrides
new file mode 100644
index 0000000..a2e676e
--- /dev/null
+++ b/debian/mariadb-common.lintian-overrides
@@ -0,0 +1 @@
+libmariadbclient18: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index 843c6f5..3a724d0 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -12,3 +12,5 @@ mariadb-server-5.5: command-with-path-in-maintainer-script postinst:146 /bin/bas
 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-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index fa6fb16..7f5b5ec 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -5,3 +5,16 @@ 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
+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

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

More information about the Pkg-mysql-commits mailing list