From 1f0e72f874bde5096a5c5c22e320a7723ff66b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Wed, 12 Feb 2020 10:44:46 +0200 Subject: Deb: Remove unnecessary manual libzstd1 dependency from RocksDB plugin The Debian build tools add all run-time dependencies automatically. For the mariadb-rocksdb-plugin the "${misc:Depends}, ${shlibs:Depends}" will become (based on the build dependencies at build time): Depends: mariadb-server-10.4 (= 1:10.4.12-1), rocksdb-tools, libc6 (>= 2.29), liblz4-1 (>= 0.0~r130), libsnappy1v5 (>= 1.1.8), libstdc++6 (>= 7), libzstd1 (>= 1.3.3), zlib1g (>= 1:1.1.4) There is no need to manually add run-time build dependencies. Only external dependencies need to be defined, for example rocksdb-tools could come in question for mariadb-plugin-rocksdb, and it will be eventually added when downstream official Debian packaging is merged upstream in a later commit. --- debian/autobake-deb.sh | 1 - debian/control | 1 - 2 files changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 4dba4de26b7..919dbd61c4f 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -77,7 +77,6 @@ fi if ! apt-cache madison libzstd-dev | grep 'libzstd-dev' >/dev/null 2>&1 then sed '/libzstd-dev/d' -i debian/control - sed '/libzstd1/d' -i debian/control fi # The binaries should be fully hardened by default. However TokuDB compilation seems to fail on diff --git a/debian/control b/debian/control index 8896f4d1dcd..b4447c71580 100644 --- a/debian/control +++ b/debian/control @@ -538,7 +538,6 @@ Description: Connect storage engine for MariaDB Package: mariadb-plugin-rocksdb Architecture: amd64 arm64 mips64el ppc64el Depends: mariadb-server-10.3 (= ${binary:Version}), - libzstd1, ${misc:Depends}, ${shlibs:Depends} Breaks: mariadb-rocksdb-engine-10.2, -- cgit v1.2.1