From 862fbc277c3e6396bdee44a54fc9769957b14ea9 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 12 Sep 2017 15:07:00 +0200 Subject: [PATCH] bugfix: debian, fix *.so symlinks in libmariadb-dev The symlink /usr/lib/libmysqlclient.so -> /usr/lib/libmysqlclient.so.18 was invalid, because the library was not in /usr/lib. The correct symlink is /usr/lib/x86_64-linux-gnu/libmysqlclient.so -> /usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 --- debian/libmariadb-dev.install | 2 ++ debian/libmariadb-dev.links | 2 -- debian/rules | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 debian/libmariadb-dev.links diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index 25092700f15..e62aad1b43f 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,6 +1,8 @@ usr/bin/mysql_config usr/include/mysql usr/lib/*/libmariadb.so +usr/lib/*/libmysqlclient.so +usr/lib/*/libmariadbclient.so usr/lib/*/libmariadbclient.a usr/lib/*/libmysqlservices.a usr/share/aclocal/mysql.m4 diff --git a/debian/libmariadb-dev.links b/debian/libmariadb-dev.links deleted file mode 100644 index 0076791dcfa..00000000000 --- a/debian/libmariadb-dev.links +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libmysqlclient.so.18 usr/lib/libmysqlclient.so -usr/lib/libmysqlclient_r.so.18 usr/lib/libmysqlclient_r.so diff --git a/debian/rules b/debian/rules index 7aa09ea988b..2f385b26455 100755 --- a/debian/rules +++ b/debian/rules @@ -162,6 +162,7 @@ override_dh_auto_install: install -D -m 644 debian/mariadb-server-10.2.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.2.py # Install libmariadbclient18 compatibility links + ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so ln -s /usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18 # Install libmysqlclientclientXX compatibility links