diff --git a/debian/control b/debian/control index 2c0763296c8..71d997074be 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Homepage: http://mariadb.org/ Vcs-Git: https://github.com/MariaDB/server.git Vcs-Browser: https://github.com/MariaDB/server/ -Package: libmariadbclient18 +Package: libmariadb3 Architecture: any Section: libs Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends} @@ -46,6 +46,8 @@ 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 +Provides: libmariadbclient18 Description: MariaDB database client library MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -57,11 +59,23 @@ Description: MariaDB database client library Package: libmysqlclient18 Section: libs Architecture: any -Depends: libmariadbclient18 (= ${binary:Version}), ${misc:Depends} +Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} Replaces: libmysqlclient18 (<< ${source:Version}) Description: Virtual package to satisfy external depends - This is an empty package that provides an updated "best" version of - libmysqlclient18 that does not conflict with the libmariadbclient18 + This is an empty package that depends on the libmariadb3 + package. + . + 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. + +Package: libmariadbclient18 +Section: libs +Architecture: any +Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends} +Description: Virtual package to satisfy external depends + This is an empty package that depends on the libmariadb3 package. . MariaDB is a fast, stable and true multi-user, multi-threaded SQL database @@ -106,19 +120,20 @@ Description: MariaDB embedded database, shared library Package: libmariadbclient-dev Architecture: any Section: libdevel -Depends: libmariadbclient18 (= ${binary:Version}), +Depends: libmariadb3 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}, ${shlibs:Depends} -Replaces: libmariadbclient16-dev, libmysqlclient16-dev -Conflicts: libmariadbclient16-dev, +Replaces: libmariadbclient16-dev, libmysqlclient16-dev, libmariadbclient-dev +Conflicts: libmariadbclient-dev, + libmariadbclient16-dev, libmysqlclient-dev, libmysqlclient10-dev, libmysqlclient12-dev, libmysqlclient14-dev, libmysqlclient15-dev, libmysqlclient16-dev -Provides: libmysqlclient-dev +Provides: libmysqlclient-dev, libmariadbclient-dev Description: MariaDB database development files MariaDB is a fast, stable and true multi-user, multi-threaded SQL database server. SQL (Structured Query Language) is the most popular database query @@ -153,7 +168,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf) Package: mariadb-client-core-10.2 Architecture: any -Depends: libmariadbclient18 (>= ${source:Version}), +Depends: libmariadb3 (>= ${source:Version}), mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -217,7 +232,7 @@ Description: MariaDB database core client binaries Package: mariadb-client-10.2 Architecture: any Depends: debianutils (>=1.6), - libmariadbclient18 (>= ${source:Version}), + libmariadb3 (>= ${source:Version}), mariadb-client-core-10.2 (>= ${source:Version}), mariadb-common, ${misc:Depends}, @@ -271,7 +286,7 @@ Description: MariaDB database client binaries Package: mariadb-server-core-10.2 Architecture: any -Depends: libmariadbclient18 (>= ${binary:Version}), +Depends: libmariadb3 (>= ${binary:Version}), mariadb-common (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/libmariadbclient-dev.README.Maintainer b/debian/libmariadb-dev.README.Maintainer similarity index 100% rename from debian/libmariadbclient-dev.README.Maintainer rename to debian/libmariadb-dev.README.Maintainer diff --git a/debian/libmariadbclient-dev.examples b/debian/libmariadb-dev.examples similarity index 100% rename from debian/libmariadbclient-dev.examples rename to debian/libmariadb-dev.examples diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadb-dev.install similarity index 100% rename from debian/libmariadbclient-dev.install rename to debian/libmariadb-dev.install diff --git a/debian/libmariadbclient-dev.links b/debian/libmariadb-dev.links similarity index 100% rename from debian/libmariadbclient-dev.links rename to debian/libmariadb-dev.links diff --git a/debian/libmariadbclient-dev.manpages b/debian/libmariadb-dev.manpages similarity index 100% rename from debian/libmariadbclient-dev.manpages rename to debian/libmariadb-dev.manpages diff --git a/debian/libmariadbclient18.install b/debian/libmariadb3.install similarity index 100% rename from debian/libmariadbclient18.install rename to debian/libmariadb3.install diff --git a/debian/libmariadbclient18.postinst b/debian/libmariadb3.postinst similarity index 100% rename from debian/libmariadbclient18.postinst rename to debian/libmariadb3.postinst diff --git a/debian/rules b/debian/rules index b0a4ceddca9..f85dcdeccfc 100755 --- a/debian/rules +++ b/debian/rules @@ -72,7 +72,7 @@ override_dh_auto_configure: # Remove symbols file on kFreeBSD builds so that # dpkg-gensymbols will not fail the build. ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64)) - rm debian/libmariadbclient18.symbols + rm debian/libmariadb3.symbols endif mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \