Revert "Remove libmariadbd as uploader is not DD and cannot upload a new package"

This reverts commit 3c61a20.

Author: ottok

Diff for: debian/changelog

@@ -9,6 +9,7 @@ mariadb-10.0 (10.0.20-3) unstable; urgency=medium
   [ Otto Kekäläinen ]
   * Clean up old cruft from rules file after review by Sergei Golubchik
   * Unified config file layout with upstream .cnf layout
+  * Created libmariadbd and moved so file from libmariadbd-dev there
   * Recover mysql-upgrade dir/link handlig wrongly removed in f7caa041db
   * Minor Lintian and documentation fixes
   * Switch 'nm -n' to 'nm --defined-only' to improve reproducible builds

Diff for: debian/control

@@ -26,11 +26,26 @@ Homepage: http://mariadb.org/
 Vcs-Git: git://anonscm.debian.org/pkg-mysql/mariadb-10.0.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mysql/mariadb-10.0.git
 
+Package: libmariadbd
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Breaks: libmariadbd-dev (<< ${source:Version}), libmysqld-dev
+Replaces: libmariadbd-dev (<< ${source:Version}), libmysqld-dev
+Description: MariaDB embedded database
+ 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 package includes the embedded server library.
+
 Package: libmariadbd-dev
 Architecture: any
 Section: libdevel
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libmariadbd (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libmysqld-dev
 Replaces: libmysqld-dev
 Description: MariaDB embedded database, development files

Diff for: debian/libmariadbd-dev.install

@@ -1,3 +1,2 @@
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
-usr/lib/*/libmysqld.so.18

Diff for: debian/libmariadbd-dev.lintian-overrides

@@ -0,0 +1 @@
+usr/lib/*/libmysqld.so.18

Diff for: debian/libmariadbd.install

@@ -0,0 +1,5 @@
+# OK as the MariaDB package is not anyway allowed to use MySQL name
+libmariadbd: package-name-doesnt-match-sonames libmysqld18
+# OK, embedded has same source
+libmariadbd: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
+libmariadbd: embedded-library usr/lib/i386-linux-gnu/libmysqld.so.18: libmysqlclient