summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-09-12 15:07:00 +0200
committerSergei Golubchik <serg@mariadb.org>2017-09-18 10:12:23 +0200
commit862fbc277c3e6396bdee44a54fc9769957b14ea9 (patch)
treeceab19c7d839b0abbf4d9e4e990f4c1bf012bde4 /debian
parentb5ead3a658fe705ec64faa2450f6f5c3e2bf3482 (diff)
downloadmariadb-git-862fbc277c3e6396bdee44a54fc9769957b14ea9.tar.gz
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
Diffstat (limited to 'debian')
-rw-r--r--debian/libmariadb-dev.install2
-rw-r--r--debian/libmariadb-dev.links2
-rwxr-xr-xdebian/rules1
3 files changed, 3 insertions, 2 deletions
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