debian/libmariadb3.install

 usr/lib/*/libmariadb.so.*
-usr/lib/*/mariadb19/plugin/client_ed25519.so
-usr/lib/*/mariadb19/plugin/dialog.so
-usr/lib/*/mariadb19/plugin/mysql_clear_password.so
+usr/lib/*/mariadb3/client_ed25519.so
+usr/lib/*/mariadb3/plugin/dialog.so
+usr/lib/*/mariadb3/plugin/mysql_clear_password.so

debian/mariadb-plugin-connect.install

 etc/mysql/conf.d/connect.cnf etc/mysql/mariadb.conf.d
-usr/lib/*/mariadb19/plugin/ha_connect.so
+usr/lib/*/mysql/plugin/ha_connect.so

debian/mariadb-plugin-cracklib-password-check.install

 etc/mysql/conf.d/cracklib_password_check.cnf etc/mysql/mariadb.conf.d
-usr/lib/*/mariadb19/plugin/cracklib_password_check.so
+usr/lib/*/mysql/plugin/cracklib_password_check.so

debian/mariadb-plugin-gssapi-client.install

-usr/lib/*/mariadb19/plugin/auth_gssapi_client.so
+usr/lib/*/mysql/plugin/auth_gssapi_client.so

debian/mariadb-plugin-gssapi-server.install

 etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
-usr/lib/*/mariadb19/plugin/auth_gssapi.so
+usr/lib/*/mysql/plugin/auth_gssapi.so

debian/mariadb-plugin-mroonga.install

-usr/lib/*/mariadb19/plugin/ha_mroonga.so
+usr/lib/*/mysql/plugin/ha_mroonga.so
 usr/share/mysql/mroonga/AUTHORS
 usr/share/mysql/mroonga/COPYING
 usr/share/mysql/mroonga/install.sql

debian/mariadb-plugin-oqgraph.install

 etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
-usr/lib/*/mariadb19/plugin/ha_oqgraph.so
+usr/lib/*/mysql/plugin/ha_oqgraph.so

debian/mariadb-plugin-rocksdb.install

@@ -2,7 +2,7 @@ etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
 usr/bin/mariadb-ldb
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
-usr/lib/*/mariadb19/plugin/ha_rocksdb.so
+usr/lib/*/mysql/plugin/ha_rocksdb.so
 usr/share/man/man1/mariadb-ldb.1
 usr/share/man/man1/myrocks_hotbackup.1
 usr/share/man/man1/mysql_ldb.1

debian/mariadb-plugin-spider.install

-usr/lib/*/mariadb19/plugin/ha_spider.so
+usr/lib/*/mysql/plugin/ha_spider.so
 usr/share/mysql/install_spider.sql

debian/mariadb-plugin-tokudb.install

@@ -2,7 +2,7 @@ etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
 etc/systemd/system/mariadb.service.d/tokudb.conf
 usr/bin/tokuft_logprint
 usr/bin/tokuftdump
-usr/lib/*/mariadb19/plugin/ha_tokudb.so
+usr/lib/*/mysql/plugin/ha_tokudb.so
 usr/share/doc/mariadb-server-10.4/README.md usr/share/doc/mariadb-plugin-tokudb/README.md
 usr/share/man/man1/tokuft_logprint.1
 usr/share/man/man1/tokuftdump.1

debian/mariadb-server-10.4.install

@@ -52,27 +52,27 @@ usr/bin/wsrep_sst_mariabackup
 usr/bin/wsrep_sst_mysqldump
 usr/bin/wsrep_sst_rsync
 usr/bin/wsrep_sst_rsync_wan
-usr/lib/*/mariadb19/plugin/auth_ed25519.so
-usr/lib/*/mariadb19/plugin/auth_pam.so
-[linux-any] usr/lib/*/mariadb19/plugin/disks.so
-usr/lib/*/mariadb19/plugin/auth_pam_tool_dir/auth_pam_tool
-usr/lib/*/mariadb19/plugin/auth_pam_v1.so
-usr/lib/*/mariadb19/plugin/caching_sha2_password.so
-usr/lib/*/mariadb19/plugin/file_key_management.so
-usr/lib/*/mariadb19/plugin/ha_archive.so
-usr/lib/*/mariadb19/plugin/ha_blackhole.so
-usr/lib/*/mariadb19/plugin/ha_federated.so
-usr/lib/*/mariadb19/plugin/ha_federatedx.so
-usr/lib/*/mariadb19/plugin/ha_sphinx.so
-usr/lib/*/mariadb19/plugin/handlersocket.so
-usr/lib/*/mariadb19/plugin/locales.so
-usr/lib/*/mariadb19/plugin/metadata_lock_info.so
-usr/lib/*/mariadb19/plugin/query_cache_info.so
-usr/lib/*/mariadb19/plugin/query_response_time.so
-usr/lib/*/mariadb19/plugin/server_audit.so
-usr/lib/*/mariadb19/plugin/simple_password_check.so
-usr/lib/*/mariadb19/plugin/sql_errlog.so
-usr/lib/*/mariadb19/plugin/wsrep_info.so
+usr/lib/*/mysql/plugin/auth_ed25519.so
+usr/lib/*/mysql/plugin/auth_pam.so
+[linux-any] usr/lib/*/mysql/plugin/disks.so
+usr/lib/*/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
+usr/lib/*/mysql/plugin/auth_pam_v1.so
+usr/lib/*/mysql/plugin/caching_sha2_password.so
+usr/lib/*/mysql/plugin/file_key_management.so
+usr/lib/*/mysql/plugin/ha_archive.so
+usr/lib/*/mysql/plugin/ha_blackhole.so
+usr/lib/*/mysql/plugin/ha_federated.so
+usr/lib/*/mysql/plugin/ha_federatedx.so
+usr/lib/*/mysql/plugin/ha_sphinx.so
+usr/lib/*/mysql/plugin/handlersocket.so
+usr/lib/*/mysql/plugin/locales.so
+usr/lib/*/mysql/plugin/metadata_lock_info.so
+usr/lib/*/mysql/plugin/query_cache_info.so
+usr/lib/*/mysql/plugin/query_response_time.so
+usr/lib/*/mysql/plugin/server_audit.so
+usr/lib/*/mysql/plugin/simple_password_check.so
+usr/lib/*/mysql/plugin/sql_errlog.so
+usr/lib/*/mysql/plugin/wsrep_info.so
 usr/share/doc/mariadb-server-10.4/mysqld.sym.gz
 [linux-any] usr/share/mysql/systemd/use_galera_new_cluster.conf
 [linux-any] usr/share/mysql/systemd/mariadb.service

debian/mariadb-server-10.4.lintian-overrides

 # OK, path /usr/sbin/invoke-rc.d is only used in check, executes are run without the path
 # False positive: unfortified calls have already been fully validated at compile-time
 # See full research at https://jira.mariadb.org/browse/MDEV-8377
-hardening-no-fortify-functions usr/lib/*/mariadb19/plugin/auth_pam.so
+hardening-no-fortify-functions usr/lib/*/mysql/plugin/auth_pam.so
 # The .so strings inside the file are part of the text body, not man page includes.
 bad-so-link-within-manual-page usr/share/man/man1/mariadb-show.1.gz

debian/patches/libmariadb3-versioned-path.patch

+Subject: Install server plugins in multi-arched directory and client plugins in multi-arched + versioned directory
+Forwarded: https://jira.mariadb.org/browse/CONC-456
+
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -175,7 +175,7 @@ SET(INSTALL_SYSCONFDIR_DEB
+ SET(INSTALL_SYSCONF2DIR_DEB             "/etc/mysql/conf.d")
+ #
+ SET(INSTALL_LIBDIR_DEB                  "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
+-SET(INSTALL_PLUGINDIR_DEB               "lib/mysql/plugin")
++SET(INSTALL_PLUGINDIR_DEB               "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/mysql/plugin")
+ #
+ SET(INSTALL_INCLUDEDIR_DEB              "include/mariadb")
+ #
+@@ -258,4 +258,3 @@ ENDFOREACH()
+ IF(NOT MYSQL_UNIX_ADDR)
+   SET(MYSQL_UNIX_ADDR ${INSTALL_UNIX_ADDRDIR})
+ ENDIF()
+-
+--- a/libmariadb/cmake/install.cmake
++++ b/libmariadb/cmake/install.cmake
+@@ -91,13 +91,9 @@ SET(LIBMARIADB_STATIC_RPM "mariadbclient
+ # DEB layout
+ #
+ SET(INSTALL_BINDIR_DEB "bin")
+-SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-SET(INSTALL_PCDIR_DEB "lib/pkgconfig")
+-IF(PLUGINDIR_DEB)
+-  SET(INSTALL_PLUGINDIR_DEB "${INSTALL_LIBDIR_DEB}/${PLUGINDIR_DEB}/plugin")
+-ELSE()
+-  SET(INSTALL_PLUGINDIR_DEB "${INSTALL_LIBDIR_DEB}/mariadb/plugin")
+-ENDIF()
++SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}")
++SET(INSTALL_PCDIR_DEB "${INSTALL_LIBDIR_DEB}/pkgconfig")
++SET(INSTALL_PLUGINDIR_DEB "${INSTALL_LIBDIR_DEB}/mariadb${CPACK_PACKAGE_VERSION_MAJOR}")
+ SET(INSTALL_INCLUDEDIR_DEB "include/mariadb")
+ SET(LIBMARIADB_STATIC_DEB "mariadb")
+
+--- a/cmake/mariadb_connector_c.cmake
++++ b/cmake/mariadb_connector_c.cmake
+@@ -24,11 +24,12 @@ SET(CONC_WITH_MYSQLCOMPAT ON)
+
+ IF (INSTALL_LAYOUT STREQUAL "RPM")
+   SET(CONC_INSTALL_LAYOUT "RPM")
++ELSEIF (INSTALL_LAYOUT STREQUAL "DEB")
++  SET(CONC_INSTALL_LAYOUT "DEB")
+ ELSE()
+   SET(CONC_INSTALL_LAYOUT "DEFAULT")
+ ENDIF()
+
+-SET(PLUGIN_INSTALL_DIR ${INSTALL_PLUGINDIR})
+ SET(MARIADB_UNIX_ADDR ${MYSQL_UNIX_ADDR})
+
+ SET(CLIENT_PLUGIN_PVIO_NPIPE STATIC)

debian/patches/series

@@ -23,3 +23,4 @@ prevent-executable-stack-due-to-objects-compiled-fro.patch
 mariadb-pc-arch-dependent.patch
 1460.patch
 1459.patch
+libmariadb3-versioned-path.patch

debian/rules

@@ -106,7 +106,8 @@ endif
 	    -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \
 			-DCMAKE_CXX_LIBRARY_ARCHITECTURE=$(DEB_HOST_MULTIARCH) \
 	    -DBUILD_CONFIG=mysql_release \
-	    -DINSTALL_PLUGINDIR=lib/$(DEB_HOST_MULTIARCH)/mariadb19/plugin \
+	    -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \
+	    -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test \
 	    -DWITH_SSL=bundled \
 	    -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
 	    -DWITH_INNODB_SNAPPY=ON \
@@ -158,21 +159,21 @@ endif
 	rm -r $(TMP)/usr/sql-bench
 
 	# Remove test plugins
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/adt_null.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/auth_0x0100.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/auth_test_plugin.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/daemon_example.ini
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/debug_key_management.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/dialog_examples.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/example_key_management.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/ha_example.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/ha_test_sql_discovery.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/libdaemon_example.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/mypluglib.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_client.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_interface.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/qa_auth_server.so
-	rm -f $(TMP)/usr/lib/*/mariadb19/plugin/test_versioning.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/adt_null.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/auth_0x0100.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/auth_test_plugin.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/daemon_example.ini
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/debug_key_management.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/dialog_examples.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/example_key_management.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/ha_example.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/ha_test_sql_discovery.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/libdaemon_example.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/mypluglib.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/qa_auth_client.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/qa_auth_interface.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/qa_auth_server.so
+	rm -f $(TMP)/usr/lib/*/mysql/plugin/test_versioning.so
 	rm -f $(TMP)/usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 
 	# Delete useless systemd files introduced in upstream commit