MDEV-6284: Sync deb build dependencies and control file with downstream

- Remove versioned depends that are far outdated and not relevant anymore
  in 2020.
- Link with libedit instead of unmaintained readline5
  https://salsa.debian.org/mariadb-team/mariadb-10.4/-/commit/d8796a0e3b5fc4450f4dc80fd159599a7f03997a
- Add [linux-any] for Linux specific depends and other smaller control
  file tweaks.
- Update .travis-ci.yml to match.
- Also fixes the Debian autopkgtest detected error:
    ERROR 1231 (42000) at line 1: Variable 'innodb_compression_algorithm'
    can't be set to the value of 'lz4'

1 files changed, 66 insertions, 63 deletions

diff --git a/debian/control b/debian/control
index 7612351d01d..10b360ab55b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net>
 Build-Depends: bison,
                chrpath,
-               cmake (>= 2.7),
                debhelper (>= 9),
+               cmake,
                dh-apparmor,
                dh-exec,
                dh-systemd,
@@ -14,80 +14,33 @@ Build-Depends: bison,
                libboost-dev,
                libcrack2-dev (>= 2.9.0),
                libcurl4-openssl-dev | libcurl4-dev,
-               libjemalloc-dev (>= 3.0.0~) [linux-any],
+               libedit-dev,
+               libjemalloc-dev [linux-any],
                libjudy-dev,
                libkrb5-dev,
+               liblz4-dev,
                libncurses5-dev (>= 5.0-6~),
                libnuma-dev [!armhf],
                libpam0g-dev,
                libpcre2-dev,
-               libreadline-gplv2-dev,
                libsnappy-dev,
                libssl-dev | libssl1.0-dev,
-               libsystemd-dev,
+               libsystemd-dev [linux-any],
                libxml2-dev,
                libzstd-dev,
                lsb-release,
-               perl (>= 5.6.0),
+               perl,
                po-debconf,
                psmisc,
                unixodbc-dev,
                uuid-dev,
                zlib1g-dev (>= 1:1.1.3-5~)
+Rules-Requires-Root: no
 Standards-Version: 3.8.2
-Homepage: http://mariadb.org/
+Homepage: https://mariadb.org/
 Vcs-Browser: https://github.com/MariaDB/server/
 Vcs-Git: https://github.com/MariaDB/server.git
 
-Package: libmariadb3
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: mariadb-common,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Conflicts: libmariadbclient18 (<< 10.2.0),
-           mariadb-galera-server-10.0,
-           mariadb-galera-server-5.5,
-           mariadb-server-10.0,
-           mariadb-server-5.1,
-           mariadb-server-5.2,
-           mariadb-server-5.3,
-           mariadb-server-5.5
-Breaks: libmariadbclient18 (<< ${source:Version})
-Replaces: libmariadbclient18 (<< ${source:Version})
-Description: MariaDB database client library
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client library.
-
-Package: libmariadb3-compat
-Architecture: any
-Section: libs
-Depends: libmariadb3,
-         mariadb-common,
-         ${misc:Depends}
-Breaks: libmysqlclient19,
-        libmysqlclient20,
-        libmysqlclient21
-Replaces: libmysqlclient19,
-          libmysqlclient20,
-          libmysqlclient21
-Provides: libmysqlclient19,
-          libmysqlclient20,
-          libmysqlclient21
-Description: MariaDB database client library MySQL compat package
- MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
- server. SQL (Structured Query Language) is the most popular database query
- language in the world. The main goals of MariaDB are speed, robustness and
- ease of use.
- .
- This package includes the client runtime libraries that simulate and replace
- the equivalents found in MySQL 5.6, 5.7 and 8.0 (mysqlclient19, 20 and 21).
-
 Package: libmariadb-dev
 Architecture: any
 Multi-Arch: same
@@ -139,6 +92,55 @@ Description: MariaDB Connector/C, compatibility symlinks
  This package includes compatibility symlinks to allow sources expecting the
  MySQL client libraries to be built against MariaDB Connector/C.
 
+Package: libmariadb3
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: mariadb-common,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libmariadbclient18 (<< 10.2.0),
+           mariadb-galera-server-10.0,
+           mariadb-galera-server-5.5,
+           mariadb-server-10.0,
+           mariadb-server-5.1,
+           mariadb-server-5.2,
+           mariadb-server-5.3,
+           mariadb-server-5.5
+Breaks: libmariadbclient18 (<< ${source:Version})
+Replaces: libmariadbclient18 (<< ${source:Version})
+Description: MariaDB database client library
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the client library.
+
+Package: libmariadb3-compat
+Architecture: any
+Section: libs
+Depends: libmariadb3,
+         mariadb-common,
+         ${misc:Depends}
+Breaks: libmysqlclient19,
+        libmysqlclient20,
+        libmysqlclient21
+Replaces: libmysqlclient19,
+          libmysqlclient20,
+          libmysqlclient21
+Provides: libmysqlclient19,
+          libmysqlclient20,
+          libmysqlclient21
+Description: MariaDB database client library MySQL compat package
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the client runtime libraries that simulate and replace
+ the equivalents found in MySQL 5.6, 5.7 and 8.0 (mysqlclient19, 20 and 21).
+
 Package: libmariadbclient18
 Section: libs
 Architecture: any
@@ -185,7 +187,7 @@ Description: MariaDB embedded database, shared library
  language in the world. The main goals of MariaDB are speed, robustness and
  ease of use.
  .
- This package includes a shared library for embedded MariaDB applications
+ This package includes a shared library for embedded MariaDB applications.
 
 Package: libmariadbd-dev
 Architecture: any
@@ -462,10 +464,10 @@ Pre-Depends: adduser (>= 3.40),
              mariadb-common (>= ${source:Version})
 Depends: galera-4 (>=26.4),
          gawk,
-         iproute | iproute2,
+         iproute2 [linux-any],
          libdbi-perl,
          lsb-base (>= 3.0-10),
-         lsof,
+         lsof [linux-any],
          mariadb-client-10.5 (>= ${source:Version}),
          mariadb-server-core-10.5 (>= ${binary:Version}),
          passwd,
@@ -574,7 +576,7 @@ Description: Backup tool for MariaDB server
  This backup tool is guaranteed to be compatible with MariaDB.
  Based on Xtrabackup, but improved to work with MariaDB.
  .
- Plese refer to the MariaDB Knowledge Base on more information on
+ Please refer to the MariaDB Knowledge Base on more information on
  how to use this tool.
 
 Package: mariadb-plugin-connect
@@ -610,7 +612,7 @@ Breaks: mariadb-rocksdb-engine-10.2,
 Replaces: mariadb-rocksdb-engine-10.2,
           mariadb-rocksdb-engine-10.3,
           mariadb-rocksdb-engine-10.4
-Recommends: python-mysqldb
+Recommends: python3-mysqldb
 Description: RocksDB storage engine for MariaDB
  The RocksDB storage engine is a high performance storage engine, aimed
  at maximising storage efficiency while maintaining InnoDB-like performance.
@@ -695,7 +697,7 @@ Replaces: mariadb-server-10.0,
 Description: Spider storage engine for MariaDB
  The Spider storage engine with built-in sharding features. It supports
  partitioning and xa transactions, and allows tables of different MariaDB
- instances to be handled as if they were on the same insctance. It refers to one
+ instances to be handled as if they were on the same instance. It refers to one
  possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
 
 Package: mariadb-plugin-cassandra
@@ -778,6 +780,7 @@ Architecture: any
 Depends: mariadb-client-10.5 (= ${binary:Version}),
          mariadb-server-10.5 (= ${binary:Version}),
          mariadb-test-data (= ${source:Version}),
+         virtual-mysql-testsuite,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
@@ -792,8 +795,7 @@ Breaks: mariadb-server-5.5,
         mysql-testsuite-5.5,
         mysql-testsuite-5.6,
         mysql-testsuite-5.7,
-        mysql-testsuite-8.0,
-        virtual-mysql-testsuite
+        mysql-testsuite-8.0
 Replaces: mariadb-server-5.5,
           mariadb-test-10.0,
           mariadb-test-10.1,
@@ -821,6 +823,7 @@ Package: mariadb-test-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends},
+         ${perl:Depends},
          ${shlibs:Depends}
 Breaks: mariadb-test-10.0,
         mariadb-test-10.1,