MDEV-28500: Hashicorp: Debian packaging is brokenbb-10.9-MDEV-19281-v5

This commit fixes a documentation installation
issue (for debian packaging) and generally brings
the installation control files up to date (as for
the rest of the components).

5 files changed, 13 insertions, 9 deletions

diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index 765f3be23e0..6fd1708cc48 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -140,7 +140,7 @@ FUNCTION(INSTALL_DOCUMENTATION)
   IF(RPM)
     SET(destination "${destination}/MariaDB-${group}-${VERSION}")
   ELSEIF(DEB)
-    SET(destination "${destination}/mariadb-${group}-${MAJOR_VERSION}.${MINOR_VERSION}")
+    SET(destination "${destination}/mariadb-${group}")
   ENDIF()
 
   INSTALL(FILES ${files} DESTINATION ${destination} COMPONENT ${ARG_COMPONENT})
diff --git a/debian/control b/debian/control
index 0fd1df3ac58..7b2d4f4bb89 100644
--- a/debian/control
+++ b/debian/control
@@ -985,7 +985,8 @@ Description: CrackLib Password Validation Plugin for MariaDB
 
 Package: mariadb-plugin-hashicorp-key-management
 Architecture: any
-Depends: mariadb-server-10.9 (= ${binary:Version}),
+Depends: libcurl4,
+         mariadb-server (= ${server:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Description: Hashicorp Key Management plugin for MariaDB
diff --git a/debian/mariadb-plugin-hashicorp-key-management.install b/debian/mariadb-plugin-hashicorp-key-management.install
index c5bf7602fd1..ca63f3df403 100644
--- a/debian/mariadb-plugin-hashicorp-key-management.install
+++ b/debian/mariadb-plugin-hashicorp-key-management.install
@@ -1,2 +1,3 @@
 etc/mysql/mariadb.conf.d/hashicorp_key_management.cnf
 usr/lib/mysql/plugin/hashicorp_key_management.so
+usr/share/doc/mariadb-plugin-hashicorp-key-management/hashicorp_key_management.txt
diff --git a/debian/not-installed b/debian/not-installed
index c4718e826a7..56061eed20c 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -25,12 +25,12 @@ usr/lib/mysql/plugin/type_test.so
 usr/lib/sysusers.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/lib/tmpfiles.d/mariadb.conf # Not used (yet) in Debian systemd
 usr/sbin/rcmysql
-usr/share/doc/mariadb-server-10.9/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING")
-usr/share/doc/mariadb-server-10.9/CREDITS
-usr/share/doc/mariadb-server-10.9/INSTALL-BINARY
-usr/share/doc/mariadb-server-10.9/README-wsrep
-usr/share/doc/mariadb-server-10.9/README.md
-usr/share/doc/mariadb-server-10.9/THIRDPARTY
+usr/share/doc/mariadb-server/COPYING (related file: "debian/tmp/usr/share/mysql/mroonga/COPYING")
+usr/share/doc/mariadb-server/CREDITS
+usr/share/doc/mariadb-server/INSTALL-BINARY
+usr/share/doc/mariadb-server/README-wsrep
+usr/share/doc/mariadb-server/README.md
+usr/share/doc/mariadb-server/THIRDPARTY
 usr/share/groonga-normalizer-mysql/README.md
 usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
 usr/share/groonga/COPYING
diff --git a/plugin/hashicorp_key_management/CMakeLists.txt b/plugin/hashicorp_key_management/CMakeLists.txt
index e75654a38d4..c68b6ccb719 100644
--- a/plugin/hashicorp_key_management/CMakeLists.txt
+++ b/plugin/hashicorp_key_management/CMakeLists.txt
@@ -16,5 +16,7 @@ MYSQL_ADD_PLUGIN(HASHICORP_KEY_MANAGEMENT
   CONFIG hashicorp_key_management.cnf
   COMPONENT hashicorp-key-management)
 
+ADD_FEATURE_INFO(HASHICORP_KEY_MANAGEMENT "ON" "Hashicorp Key Management Plugin")
+
 INSTALL_DOCUMENTATION(hashicorp_key_management.txt
-        COMPONENT hashicorp-key-management)
+  COMPONENT plugin-hashicorp-key-management)