Skip to content

Commit 25253b7

Browse files
committed
MDEV-37776: Debian shlibs:Depends shouldn't be explict
The Debian library dependencies are auto detected and populated as part of shlibs:Depends and the explicit population is suspectable to distro packaging changes. Also fix the server gssapi plugin to the compiled server dependency consistent with other server plugins.
1 parent 39e7133 commit 25253b7

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

debian/control

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -830,8 +830,7 @@ Description: Connect storage engine for MariaDB server
830830

831831
Package: mariadb-plugin-s3
832832
Architecture: any
833-
Depends: libcurl4,
834-
mariadb-server (= ${server:Version}),
833+
Depends: mariadb-server (= ${server:Version}),
835834
${misc:Depends},
836835
${shlibs:Depends}
837836
Description: Amazon S3 archival storage engine for MariaDB
@@ -860,8 +859,7 @@ Description: RocksDB storage engine for MariaDB server
860859

861860
Package: mariadb-plugin-oqgraph
862861
Architecture: any
863-
Depends: libjudydebian1,
864-
mariadb-server (= ${server:Version}),
862+
Depends: mariadb-server (= ${server:Version}),
865863
${misc:Depends},
866864
${shlibs:Depends}
867865
Breaks: mariadb-oqgraph-engine-10.0,
@@ -926,8 +924,7 @@ Description: Spider storage engine for MariaDB server
926924

927925
Package: mariadb-plugin-gssapi-server
928926
Architecture: any
929-
Depends: libgssapi-krb5-2,
930-
mariadb-server,
927+
Depends: mariadb-server (= ${server:Version}),
931928
${misc:Depends},
932929
${shlibs:Depends}
933930
Breaks: mariadb-gssapi-server-10.1,
@@ -950,8 +947,7 @@ Description: GSSAPI authentication plugin for MariaDB server
950947

951948
Package: mariadb-plugin-gssapi-client
952949
Architecture: any
953-
Depends: libgssapi-krb5-2,
954-
mariadb-client (= ${binary:Version}),
950+
Depends: mariadb-client (= ${binary:Version}),
955951
${misc:Depends},
956952
${shlibs:Depends}
957953
Breaks: mariadb-gssapi-client-10.1,
@@ -970,8 +966,7 @@ Description: GSSAPI authentication plugin for MariaDB client
970966

971967
Package: mariadb-plugin-cracklib-password-check
972968
Architecture: any
973-
Depends: libcrack2 (>= 2.9.0),
974-
mariadb-server,
969+
Depends: mariadb-server,
975970
${misc:Depends},
976971
${shlibs:Depends}
977972
Description: CrackLib Password Validation Plugin for MariaDB server
@@ -984,8 +979,7 @@ Description: CrackLib Password Validation Plugin for MariaDB server
984979

985980
Package: mariadb-plugin-hashicorp-key-management
986981
Architecture: any
987-
Depends: libcurl4,
988-
mariadb-server,
982+
Depends: mariadb-server,
989983
${misc:Depends},
990984
${shlibs:Depends}
991985
Description: Hashicorp Key Management plugin for MariaDB

0 commit comments

Comments
 (0)