Merge bb-10.2-ext into 10.3

7 files changed, 19 insertions, 20 deletions

diff --git a/debian/control b/debian/control
index d51ec7cf13e..5f41323bb63 100644
--- a/debian/control
+++ b/debian/control
@@ -48,14 +48,11 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
-           mariadb-server-5.5 (<< 5.5.33)
-Replaces: libmariadbclient18,
-          libmysqlclient18,
-          libmysqlclient19,
+           mariadb-server-5.5 (<< 5.5.33),
+           libmariadbclient18 (<< 10.2.0)
+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
@@ -69,27 +66,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
@@ -175,8 +174,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
 
 Package: mariadb-client-core-10.3
 Architecture: any
-Depends: libmariadb3 (>= ${source:Version}),
-         mariadb-common (>= ${source:Version}),
+Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-client-10.0,
@@ -243,7 +241,6 @@ Description: MariaDB database core client binaries
 Package: mariadb-client-10.3
 Architecture: any
 Depends: debianutils (>=1.6),
-         libmariadb3 (>= ${source:Version}),
          mariadb-client-core-10.3 (>= ${source:Version}),
          mariadb-common,
          ${misc:Depends},
@@ -299,8 +296,7 @@ Description: MariaDB database client binaries
 
 Package: mariadb-server-core-10.3
 Architecture: any
-Depends: libmariadb3 (>= ${binary:Version}),
-         mariadb-common (>= ${source:Version}),
+Depends: mariadb-common (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: mariadb-server-core-10.0,
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/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
diff --git a/debian/rules b/debian/rules
index 09e91988207..cd910b5cc6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -162,6 +162,7 @@ override_dh_auto_install:
 	install -D -m 644 debian/mariadb-server-10.3.py $(TMP)/usr/share/apport/package-hooks/source_mariadb-10.3.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