[Pkg-mysql-commits] [mariadb-5.5] 01/02: Lintian override files typo- and functional fixes based on upstream developer feedback (Sergei G).

Otto Kekäläinen ottok-guest at moszumanska.debian.org
Wed Aug 6 23:31:33 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 54f94764646328d6cd1c196945dd778c94446d17
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Wed Aug 6 22:45:39 2014 +0300

    Lintian override files typo- and functional fixes based on upstream developer feedback (Sergei G).
---
 debian/changelog                                 | 3 ++-
 debian/control                                   | 2 +-
 debian/mariadb-client-5.5.lintian-overrides      | 5 -----
 debian/mariadb-client-5.5.manpages               | 1 +
 debian/mariadb-client-core-5.5.lintian-overrides | 2 +-
 debian/mariadb-client.lintian-overrides          | 2 +-
 debian/mariadb-common.lintian-overrides          | 3 +--
 debian/mariadb-server-5.5.install                | 1 -
 debian/mariadb-server-5.5.lintian-overrides      | 2 --
 debian/mariadb-server-5.5.manpages               | 1 -
 debian/mariadb-server-core-5.5.lintian-overrides | 2 +-
 debian/mariadb-server.lintian-overrides          | 2 +-
 debian/source.lintian-overrides                  | 5 -----
 13 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ffe256..86435d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 mariadb-5.5 (5.5.38-2) unstable; urgency=low
 
   * Fixed wrongly applied fix of MDEV-5957 (Closes: #752203)
-  * Add in retrospect corresponding MariaDB CVEs for Oracle SPU July 2014 (Closes: #754940)
+  * Add in retrospect corresponding MariaDB CVEs for
+    Oracle SPU July 2014 (Closes: #754940)
     - CVE-2014-2494
     - CVE-2014-4207
     - CVE-2014-4243
diff --git a/debian/control b/debian/control
index 8d96ce3..73caaac 100644
--- a/debian/control
+++ b/debian/control
@@ -120,7 +120,7 @@ Package: mariadb-client-5.5
 Architecture: any
 Depends: debianutils (>=1.6),
          libdbi-perl,
-	 libterm-readkey-perl,
+         libterm-readkey-perl,
          mariadb-client-core-5.5 (>= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
diff --git a/debian/mariadb-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
index 5ca29c6..46e4474 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -6,8 +6,3 @@ 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-client-5.5.manpages b/debian/mariadb-client-5.5.manpages
index 5342137..3e6e969 100644
--- a/debian/mariadb-client-5.5.manpages
+++ b/debian/mariadb-client-5.5.manpages
@@ -11,3 +11,4 @@ debian/additions/mysqlreport.1
 debian/tmp/usr/share/man/man1/mysqlshow.1
 debian/tmp/usr/share/man/man1/mysqlslap.1
 debian/tmp/usr/share/man/man1/mysql_waitpid.1
+debian/tmp/usr/share/man/man1/innochecksum.1
diff --git a/debian/mariadb-client-core-5.5.lintian-overrides b/debian/mariadb-client-core-5.5.lintian-overrides
index 2f8573a..c071905 100644
--- a/debian/mariadb-client-core-5.5.lintian-overrides
+++ b/debian/mariadb-client-core-5.5.lintian-overrides
@@ -1,5 +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
+# OK in newer Debian, includes support for xz
 mariadb-client-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-client.lintian-overrides b/debian/mariadb-client.lintian-overrides
index 03c5a5e..ce1bca0 100644
--- a/debian/mariadb-client.lintian-overrides
+++ b/debian/mariadb-client.lintian-overrides
@@ -1,3 +1,3 @@
-# OK in neẃer Debian, includes support for xz
+# OK in newer Debian, includes support for xz
 mariadb-client: data.tar.xz-member-without-dpkg-pre-depends
 
diff --git a/debian/mariadb-common.lintian-overrides b/debian/mariadb-common.lintian-overrides
index 5ee222b..c8a97e8 100644
--- a/debian/mariadb-common.lintian-overrides
+++ b/debian/mariadb-common.lintian-overrides
@@ -1,3 +1,2 @@
-mariadb-common: data.tar.xz-member-without-dpkg-pre-depends
-# OK in neẃer Debian, includes support for xz
+# OK in newer Debian, includes support for xz
 mariadb-common: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server-5.5.install b/debian/mariadb-server-5.5.install
index d77e4d6..4d9abc0 100644
--- a/debian/mariadb-server-5.5.install
+++ b/debian/mariadb-server-5.5.install
@@ -39,7 +39,6 @@ usr/lib/mysql/plugin/sql_errlog.so
 usr/share/doc/mariadb-server-5.5/INFO_BIN
 usr/share/doc/mariadb-server-5.5/INFO_SRC
 usr/share/doc/mariadb-server-5.5/mysqld.sym.gz
-usr/share/man/man1/innochecksum.1
 usr/share/man/man1/msql2mysql.1
 usr/share/man/man1/my_print_defaults.1
 usr/share/man/man1/myisam_ftdump.1
diff --git a/debian/mariadb-server-5.5.lintian-overrides b/debian/mariadb-server-5.5.lintian-overrides
index e40c340..2bdcfca 100644
--- a/debian/mariadb-server-5.5.lintian-overrides
+++ b/debian/mariadb-server-5.5.lintian-overrides
@@ -6,5 +6,3 @@ mariadb-server-5.5: data.tar.xz-member-without-dpkg-pre-depends
 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/mariadb-server-5.5.manpages b/debian/mariadb-server-5.5.manpages
index 67ecd34..ea32847 100644
--- a/debian/mariadb-server-5.5.manpages
+++ b/debian/mariadb-server-5.5.manpages
@@ -23,5 +23,4 @@ debian/tmp/usr/share/man/man1/perror.1
 debian/tmp/usr/share/man/man1/replace.1
 debian/tmp/usr/share/man/man1/resolveip.1
 debian/tmp/usr/share/man/man1/resolve_stack_dump.1
-debian/tmp/usr/share/man/man1/innochecksum.1
 debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1
diff --git a/debian/mariadb-server-core-5.5.lintian-overrides b/debian/mariadb-server-core-5.5.lintian-overrides
index e7f9206..64d5a10 100644
--- a/debian/mariadb-server-core-5.5.lintian-overrides
+++ b/debian/mariadb-server-core-5.5.lintian-overrides
@@ -1,4 +1,4 @@
 # Embedded with same source OK
 mariadb-server-core-5.5: embedded-library usr/sbin/mysqld: libmysqlclient
-# OK in neẃer Debian, includes support for xz
+# OK in newer Debian, includes support for xz
 mariadb-server-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-server.lintian-overrides b/debian/mariadb-server.lintian-overrides
index 67b32a9..2bcf2bb 100644
--- a/debian/mariadb-server.lintian-overrides
+++ b/debian/mariadb-server.lintian-overrides
@@ -1,2 +1,2 @@
-# OK in neẃer Debian, includes support for xz
+# OK in newer Debian, includes support for xz
 mariadb-server: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index ba28d40..93a39ce 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -5,8 +5,3 @@ 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 mysys/sha1.c
-# Autotools is not used, these files are just old cruft from upstream
-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

More information about the Pkg-mysql-commits mailing list