Merging debian version 1:10.11.7-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 9 deletions

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 9a0e0627..72674895 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -4,6 +4,13 @@ version-substvar-for-external-package Replaces ${source:Version} libmariadb-dev
 source-is-missing [sql/share/charsets/languages.html]
 source-is-missing [storage/rocksdb/rocksdb/docs/_includes/footer.html]
 # Data or test files where long lines are justified
+very-long-line-length-in-source-file * [*.dfm:*]
+very-long-line-length-in-source-file * [*.expected:*]
+very-long-line-length-in-source-file * [*.frm:*]
+very-long-line-length-in-source-file * [*.MYD:*]
+very-long-line-length-in-source-file * [*.MYI:*]
+very-long-line-length-in-source-file * [*.p7b:*]
+very-long-line-length-in-source-file * [*.pcap:*]
 very-long-line-length-in-source-file * [*.result:*]
 very-long-line-length-in-source-file * [*.test:*]
 very-long-line-length-in-source-file * [*COPYING.rtf:*]
@@ -14,10 +21,13 @@ very-long-line-length-in-source-file * [*.launch:*]
 very-long-line-length-in-source-file * [*.md:*]
 very-long-line-length-in-source-file * [*.scfg:*]
 very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/configure.ac:*]
+very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/ssl.h:*]
+very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/types.h:*]
+very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/dox_comments/header_files-ja/wolfio.h:*]
 very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css:*]
 very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c:*]
 very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/IDE/IAR-MSP430/main.c:*]
-very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/scripts/*.pcap:*]
+very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/README:*]
 # Preprocessed C files which have long lines
 very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/wolfcrypt/src/*.i:*]
 # These are all results for test cases and similar so they can be
@@ -25,13 +35,10 @@ very-long-line-length-in-source-file * [extra/wolfssl/wolfssl/wolfcrypt/src/*.i:
 very-long-line-length-in-source-file * [mysql-test/*.000*:*]
 very-long-line-length-in-source-file * [mysql-test/*.ARZ:*]
 very-long-line-length-in-source-file * [mysql-test/*.dump:*]
-very-long-line-length-in-source-file * [mysql-test/*.frm:*]
 very-long-line-length-in-source-file * [mysql-test/*.ibd:*]
 very-long-line-length-in-source-file * [mysql-test/*.inc:*]
 very-long-line-length-in-source-file * [mysql-test/*.MAD:*]
 very-long-line-length-in-source-file * [mysql-test/*.MAI:*]
-very-long-line-length-in-source-file * [mysql-test/*.MYD:*]
-very-long-line-length-in-source-file * [mysql-test/*.MYI:*]
 very-long-line-length-in-source-file * [mysql-test/*.rdiff:*]
 very-long-line-length-in-source-file * [mysql-test/*.txt:*]
 very-long-line-length-in-source-file * [mysql-test/*.weekly:*]
@@ -39,10 +46,6 @@ very-long-line-length-in-source-file * [mysql-test/*001:*]
 very-long-line-length-in-source-file * [mysql-test/*ibdata*:*]
 very-long-line-length-in-source-file * [mysql-test/std_data/Moscow_leap:*]
 very-long-line-length-in-source-file * [mysql-test/suite/parts/r/*.out:*]
-# Test file
-very-long-line-length-in-source-file * [libmysqld/examples/builder-sample/emb_samples.dfm:*]
-very-long-line-length-in-source-file * [plugin/handler_socket/regtest/test_01_lib/test19.expected:*]
-very-long-line-length-in-source-file * [storage/connect/mysql-test/connect/std_data/mdev9949.frm:*]
 # SQL source file that has very long inserts/selects
 very-long-line-length-in-source-file * [scripts/fill_help_tables.sql:*]
 very-long-line-length-in-source-file * [scripts/mysql_system_tables.sql:*]
@@ -50,7 +53,7 @@ very-long-line-length-in-source-file * [scripts/mysql_system_tables.sql:*]
 very-long-line-length-in-source-file * [sql/share/charsets/languages.html:*]
 very-long-line-length-in-source-file * [sql/share/errmsg-utf8.txt:*]
 # Very long test string
-very-long-line-length-in-source-file 1052 > 512 [storage/archive/archive_test.c:30]
+very-long-line-length-in-source-file * [storage/archive/archive_test.c:*]
 # ColumnStore ignores
 # In Directory mysql-test are some long test includes
 very-long-line-length-in-source-file * [storage/columnstore/columnstore/.drone.jsonnet:*]
@@ -83,3 +86,13 @@ source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/*
 source-contains-autogenerated-visual-c++-file [storage/columnstore/columnstore/*.rc]
 source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/resource.h]
 source-contains-autogenerated-visual-c++-file [win/upgrade_wizard/upgrade.rc]
+# Known cases, pending to be fixed upstream
+very-long-line-length-in-source-file * [libmariadb/benchmark/main-benchmark.cc:*]
+very-long-line-length-in-source-file * [man/mysql.1:*]
+very-long-line-length-in-source-file * [scripts/msql2mysql.sh:*]
+very-long-line-length-in-source-file * [scripts/wsrep_sst_mysqldump.sh:*]
+very-long-line-length-in-source-file * [sql-bench/bench-init.pl.sh:*]
+very-long-line-length-in-source-file * [sql-bench/test-ATIS.sh:*]
+very-long-line-length-in-source-file * [sql-bench/test-wisconsin.sh:*]
+very-long-line-length-in-source-file * [storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp:*]
+very-long-line-length-in-source-file * [strings/ctype-czech.c:*]