diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-12-22 10:17:26 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-12-22 10:17:26 +0100 |
| commit | 9b10b4181f70634c9fab96ff0a225147b64396d7 (patch) | |
| tree | aa6e01ea81d1d64a36b19f3de7f48a6eda8d9422 | |
| parent | 27f20d192c118c3c8ae03d8e29759f343e46ad78 (diff) | |
| download | mariadb-git-9b10b4181f70634c9fab96ff0a225147b64396d7.tar.gz | |
update libmariadb, and fix debian packaging for client libs
| -rw-r--r-- | debian/libmariadb-dev.install | 1 | ||||
| -rw-r--r-- | debian/libmariadb3.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 | ||||
| m--------- | libmariadb | 0 |
4 files changed, 5 insertions, 6 deletions
diff --git a/debian/libmariadb-dev.install b/debian/libmariadb-dev.install index 2097df6b99c..e11eceb704e 100644 --- a/debian/libmariadb-dev.install +++ b/debian/libmariadb-dev.install @@ -1,5 +1,4 @@ usr/bin/mysql_config -usr/include/mariadb usr/include/mysql/*.h usr/include/mysql/psi/*.h usr/lib/*/libmariadb.so diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index 0e0c0cdc82f..cdb1e5918df 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,5 +1,5 @@ usr/lib/*/libmariadbclient.so.* usr/lib/*/libmysqlclient.so.* -usr/lib/mariadb/libmariadb.so.* +usr/lib/*/libmariadb.so.* usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so diff --git a/debian/rules b/debian/rules index 003acdcbffe..707857a0bac 100755 --- a/debian/rules +++ b/debian/rules @@ -158,12 +158,12 @@ 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/mariadb/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18 + ln -s $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.so.18 # Install libmysqlclientclientXX compatibility links - ln -s /usr/lib/mariadb/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18 - ln -s /usr/lib/mariadb/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 - ln -s /usr/lib/mariadb/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 + ln -s $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.18 + ln -s $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.19 + ln -s $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb.so.3 $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.20 touch $@ diff --git a/libmariadb b/libmariadb -Subproject 3837442cbc62c867198091b43dff40198fb6b76 +Subproject cae391f7bf47f17fb246cded8ddf0ef19dbfbde |