update libmariadb, and fix debian packaging for client libs

MariaDB · Dec 22, 2016 · 9b10b41 · 9b10b41
1 parent 27f20d1
commit 9b10b41
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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