Merging debian version 1:11.4.2-1.HEADprogress-linux

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

	debian/control
	debian/libmariadbd19.install
	debian/libmariadbd19.lintian-overrides
	debian/salsa-ci.yml

1 files changed, 182 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index 78f9201e..8bcb3c6e 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,11 @@ Build-Depends:
  cmake,
  cracklib-runtime <!nocheck>,
  debhelper-compat (= 13),
+<<<<<<< HEAD
  debhelper (>= 13.13~),
+=======
+ default-jdk,
+>>>>>>> a4925811 (Adding debian version 1:11.4.2-1.)
  dh-exec,
  gdb <!nocheck>,
  libboost-dev,
@@ -29,6 +33,7 @@ Build-Depends:
  liblzma-dev,
  liblzo2-dev,
  libncurses-dev,
+ libnet-ssleay-perl <!nocheck>,
  libnuma-dev [linux-any],
  libpam0g-dev,
  libpcre2-dev,
@@ -150,6 +155,7 @@ Description: MariaDB database client library
  .
  This package includes the client library.
 
+<<<<<<< HEAD
 Package: libmariadbd19
 Architecture: any
 Section: libs
@@ -192,6 +198,8 @@ Description: MariaDB embedded database, development files
  This package includes the MariaDB embedded server library development and
  header files.
 
+=======
+>>>>>>> a4925811 (Adding debian version 1:11.4.2-1.)
 Package: mariadb-common
 Architecture: all
 Depends:
@@ -397,6 +405,97 @@ Description: MariaDB database client binaries
  This package includes the client binaries and the additional tools
  innotop and mariadb-report (mysqlreport).
 
+Package: mariadb-client-compat
+Architecture: all
+Depends:
+ mariadb-client (>= ${source:Version}),
+ ${misc:Depends},
+Breaks:
+ mariadb-client (<< 11.0.0),
+ mariadb-client-core (<< 11.0.0),
+ mariadb-server (<< 11.0.0),
+ mariadb-server-10.5 (<< 1:10.11),
+ mariadb-server-core (<< 11.0.0),
+ mysql-client (<< 5.0.51),
+Replaces:
+ mariadb-client (<< 11.0.0),
+ mariadb-client-core (<< 11.0.0),
+ mariadb-server (<< 11.0.0),
+ mariadb-server-10.5 (<< 1:10.11),
+ mariadb-server-core (<< 11.0.0),
+ mysql-client (<< 5.0.51),
+Conflicts:
+ mariadb-client-10.0,
+ mariadb-client-10.1,
+ mariadb-client-10.2,
+ mariadb-client-10.3,
+ mariadb-client-10.4,
+ mariadb-client-10.5,
+ mariadb-client-10.6,
+ mariadb-client-10.7,
+ mariadb-client-10.8,
+ mariadb-client-5.1,
+ mariadb-client-5.2,
+ mariadb-client-5.3,
+ mariadb-client-5.5,
+ mariadb-client-core-10.0,
+ mariadb-client-core-10.1,
+ mariadb-client-core-10.2,
+ mariadb-client-core-10.3,
+ mariadb-client-core-10.4,
+ mariadb-client-core-10.5,
+ mariadb-client-core-10.6,
+ mariadb-client-core-10.7,
+ mariadb-client-core-10.8,
+ mariadb-client-core-5.1,
+ mariadb-client-core-5.2,
+ mariadb-client-core-5.3,
+ mariadb-client-core-5.5,
+ mariadb-server-10.0,
+ mariadb-server-10.1,
+ mariadb-server-10.2,
+ mariadb-server-10.3,
+ mariadb-server-10.4,
+ mariadb-server-10.6,
+ mariadb-server-10.7,
+ mariadb-server-10.8,
+ mariadb-server-core-10.0,
+ mariadb-server-core-10.1,
+ mariadb-server-core-10.2,
+ mariadb-server-core-10.3,
+ mariadb-server-core-10.4,
+ mariadb-server-core-10.5,
+ mariadb-server-core-10.6,
+ mariadb-server-core-10.7,
+ mariadb-server-core-10.8,
+ mysql-client-5.0,
+ mysql-client-5.1,
+ mysql-client-5.5,
+ mysql-client-5.6,
+ mysql-client-5.7,
+ mysql-client-8.0,
+ mysql-client-core-5.0,
+ mysql-client-core-5.1,
+ mysql-client-core-5.5,
+ mysql-client-core-5.6,
+ mysql-client-core-5.7,
+ mysql-client-core-8.0,
+ mysql-server-5.7,
+ mysql-server-core-8.0,
+ percona-server-server,
+ percona-server-server-5.6,
+ percona-xtradb-cluster-server,
+ percona-xtradb-cluster-server-5.6,
+ percona-xtradb-cluster-server-5.7,
+Multi-Arch: foreign
+Description: MySQL compatibility links to mariadb-client binaries/scripts
+ The package contains links and binaries that are needed by MySQL centric
+ tools which also works with MariaDB.
+ .
+ This package is also useful for users with long background in MySQL
+ maintenance who wants to switch to MariaDB but wants to continue using
+ familiar 'mysql' command-line tools instead of their MariaDB equivalents.
+
 Package: mariadb-server-core
 Architecture: any
 Depends:
@@ -585,10 +684,71 @@ Description: MariaDB database server binaries
  .
  This package includes the server binaries.
 
+Package: mariadb-server-compat
+Architecture: all
+Depends:
+ mariadb-server (>= ${source:Version}),
+ ${misc:Depends},
+Breaks:
+ mariadb-server (<< 11.0.0),
+ mariadb-server-10.5 (<< 1:10.11),
+ mariadb-server-core (<< 11.0.0),
+Replaces:
+ mariadb-server (<< 11.0.0),
+ mariadb-server-10.5 (<< 1:10.11),
+ mariadb-server-core (<< 11.0.0),
+Conflicts:
+ mariadb-server-10.0,
+ mariadb-server-10.1,
+ mariadb-server-10.2,
+ mariadb-server-10.3,
+ mariadb-server-10.4,
+ mariadb-server-10.6,
+ mariadb-server-10.7,
+ mariadb-server-10.8,
+ mariadb-server-5.1,
+ mariadb-server-5.2,
+ mariadb-server-5.3,
+ mariadb-server-5.5,
+ mariadb-server-core-10.0,
+ mariadb-server-core-10.1,
+ mariadb-server-core-10.2,
+ mariadb-server-core-10.3,
+ mariadb-server-core-10.4,
+ mariadb-server-core-10.5,
+ mariadb-server-core-10.6,
+ mariadb-server-core-10.7,
+ mariadb-server-core-10.8,
+ mariadb-server-core-5.1,
+ mariadb-server-core-5.2,
+ mariadb-server-core-5.3,
+ mariadb-server-core-5.5,
+ mysql-server-5.0,
+ mysql-server-core-5.0,
+ mysql-server-core-5.1,
+ mysql-server-core-5.5,
+ mysql-server-core-5.6,
+ mysql-server-core-5.7,
+ mysql-server-core-8.0,
+ percona-server-server,
+ percona-server-server-5.6,
+ percona-server-server-5.7,
+ percona-xtradb-cluster-server,
+ percona-xtradb-cluster-server-5.6,
+ percona-xtradb-cluster-server-5.7,
+Multi-Arch: foreign
+Description: MySQL compatibility links to mariadb-server binaries/scripts
+ The package contains links and binaries that are needed by MySQL centric
+ tools which also works with MariaDB.
+ .
+ This package is also useful for users with long background in MySQL
+ maintenance who wants to switch to MariaDB but wants to continue using
+ familiar 'mysql' commands instead of their MariaDB equivalents.
+
 Package: mariadb-server-10.5
 Architecture: any
 Depends:
- mariadb-server (>= 1:10.11),
+ mariadb-server (>= 1:11.4),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: MariaDB database server binaries (transitional dummy package)
@@ -652,6 +812,26 @@ Description: Connect storage engine for MariaDB server
  other interesting features.
  This package contains the Connect plugin for MariaDB server.
 
+Package: mariadb-plugin-connect-jdbc
+Architecture: all
+Depends:
+ default-jre-headless,
+ ${misc:Depends},
+Suggests:
+ libcsvjdbc-java,
+ libmariadb-java,
+ libpostgis-java,
+ libpostgresql-jdbc-java,
+ libxerial-sqlite-jdbc-java,
+Enhances:
+ mariadb-plugin-connect,
+Description: Connect storage engine JDBC interface for MariaDB server
+ To connect to remote DBMS using Connect Storage Engine (SE) and JDBC driver,
+ there is need for JDBC interface byte code.
+ The JDBC driver for the remote DBMS connection is required.
+ This package contains the Connect SE plugin JDBC interface file for MariaDB
+ server.
+
 Package: mariadb-plugin-s3
 Architecture: any
 Depends:
@@ -884,6 +1064,7 @@ Description: Snappy compression support in the server and storage engines
 Package: mariadb-test
 Architecture: any
 Depends:
+ libnet-ssleay-perl,
  mariadb-client (= ${binary:Version}),
  mariadb-server (= ${server:Version}),
  mariadb-test-data (= ${source:Version}),