From b5ead3a658fe705ec64faa2450f6f5c3e2bf3482 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 10 Sep 2017 13:50:05 +0200 Subject: [PATCH] MDEV-13589 libmariadbclient18 is broken when using mariadb repo instead of debian's put libmariadbclient18 symlinks into libmariadbclient18.deb package, not into libmariadb3.deb, because installing/reinstalling libmariadbclient18.deb must recreate these symlinks. --- debian/control | 18 ++++++++---------- debian/libmariadb3.install | 4 ++-- debian/libmariadbclient18.install | 1 + debian/libmysqlclient18.install | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 debian/libmariadbclient18.install create mode 100644 debian/libmysqlclient18.install diff --git a/debian/control b/debian/control index 50b07e73537..faed5b9c120 100644 --- a/debian/control +++ b/debian/control @@ -48,13 +48,9 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), mariadb-server-5.2, mariadb-server-5.3, mariadb-server-5.5 (<< 5.5.33) -Replaces: libmariadbclient18, - libmysqlclient18, - libmysqlclient19, +Replaces: libmysqlclient19, libmysqlclient20 -Provides: libmariadbclient18, - libmysqlclient18, - libmysqlclient19, +Provides: libmysqlclient19, libmysqlclient20 Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -68,27 +64,29 @@ Package: libmariadbclient18 Section: libs Architecture: any Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Replaces: libmariadbclient18 +Provides: libmariadbclient18 Description: Virtual package to satisfy external depends MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MariaDB are speed, robustness and ease of use. . - This is an empty package that depends on the libmariadb3 - package. + This package provides compatibility symlinks for libmariadb3 Package: libmysqlclient18 Section: libs Architecture: any Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Replaces: libmysqlclient18 +Provides: libmysqlclient18 Description: Virtual package to satisfy external depends MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query language in the world. The main goals of MariaDB are speed, robustness and ease of use. . - This is an empty package that depends on the libmariadb3 - package. + This package provides compatibility symlinks for libmariadb3 Package: libmariadb-dev Architecture: any diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install index cdb1e5918df..58e2bd1dcb2 100644 --- a/debian/libmariadb3.install +++ b/debian/libmariadb3.install @@ -1,5 +1,5 @@ -usr/lib/*/libmariadbclient.so.* -usr/lib/*/libmysqlclient.so.* +usr/lib/*/libmysqlclient.so.19 +usr/lib/*/libmysqlclient.so.20 usr/lib/*/libmariadb.so.* usr/lib/mysql/plugin/dialog.so usr/lib/mysql/plugin/mysql_clear_password.so diff --git a/debian/libmariadbclient18.install b/debian/libmariadbclient18.install new file mode 100644 index 00000000000..e3939fa4fc7 --- /dev/null +++ b/debian/libmariadbclient18.install @@ -0,0 +1 @@ +usr/lib/*/libmariadbclient.so.18 diff --git a/debian/libmysqlclient18.install b/debian/libmysqlclient18.install new file mode 100644 index 00000000000..3193873093f --- /dev/null +++ b/debian/libmysqlclient18.install @@ -0,0 +1 @@ +usr/lib/*/libmysqlclient.so.18