Commit 2bcc16c1 authored by Otto Kekäläinen's avatar Otto Kekäläinen

Deb: rename client library packages to reflect its contents

The new library name libmariadb3 matches the libmariadb.so.3 filename.
Packages that want to build against MariaDB Connector C have as
build-dependency libmariadb-dev and as run-time dependency libmariadb3.

Make the package provide libmariadbclient18 for backwards compatibility,
though compatibility is not always assured. There library did change
to a whole new generation after all, even though ABI compatibility has
been a design goal.

Also do the equivalent change for the -dev package. Packages that
explicitly want to use the MariaDB Connector C should mark it as
their build-depends.

Also provide an empty libmariadbclient18 metapackage to facilitate
upgrades from old MariaDB installs, just like there is an empty
libmysqlclient18 package. Create more of these in the future as needed.
parent 54bd67a4
...@@ -35,7 +35,7 @@ Homepage: http://mariadb.org/ ...@@ -35,7 +35,7 @@ Homepage: http://mariadb.org/
Vcs-Git: https://github.com/MariaDB/server.git Vcs-Git: https://github.com/MariaDB/server.git
Vcs-Browser: https://github.com/MariaDB/server/ Vcs-Browser: https://github.com/MariaDB/server/
Package: libmariadbclient18 Package: libmariadb3
Architecture: any Architecture: any
Section: libs Section: libs
Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends} Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
...@@ -46,6 +46,8 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5), ...@@ -46,6 +46,8 @@ Conflicts: mariadb-galera-server-10.0 (<< 10.0.5),
mariadb-server-5.2, mariadb-server-5.2,
mariadb-server-5.3, mariadb-server-5.3,
mariadb-server-5.5 (<< 5.5.33) mariadb-server-5.5 (<< 5.5.33)
Replaces: libmariadbclient18
Provides: libmariadbclient18
Description: MariaDB database client library Description: MariaDB database client library
MariaDB is a fast, stable and true multi-user, multi-threaded SQL 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 server. SQL (Structured Query Language) is the most popular database query
...@@ -57,11 +59,23 @@ Description: MariaDB database client library ...@@ -57,11 +59,23 @@ Description: MariaDB database client library
Package: libmysqlclient18 Package: libmysqlclient18
Section: libs Section: libs
Architecture: any Architecture: any
Depends: libmariadbclient18 (= ${binary:Version}), ${misc:Depends} Depends: libmariadb3 (= ${binary:Version}), ${misc:Depends}
Replaces: libmysqlclient18 (<< ${source:Version}) Replaces: libmysqlclient18 (<< ${source:Version})
Description: Virtual package to satisfy external depends Description: Virtual package to satisfy external depends
This is an empty package that provides an updated "best" version of This is an empty package that depends on the libmariadb3
libmysqlclient18 that does not conflict with the libmariadbclient18 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. package.
. .
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
...@@ -106,19 +120,20 @@ Description: MariaDB embedded database, shared library ...@@ -106,19 +120,20 @@ Description: MariaDB embedded database, shared library
Package: libmariadbclient-dev Package: libmariadbclient-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
Depends: libmariadbclient18 (= ${binary:Version}), Depends: libmariadb3 (= ${binary:Version}),
zlib1g-dev, zlib1g-dev,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Replaces: libmariadbclient16-dev, libmysqlclient16-dev Replaces: libmariadbclient16-dev, libmysqlclient16-dev, libmariadbclient-dev
Conflicts: libmariadbclient16-dev, Conflicts: libmariadbclient-dev,
libmariadbclient16-dev,
libmysqlclient-dev, libmysqlclient-dev,
libmysqlclient10-dev, libmysqlclient10-dev,
libmysqlclient12-dev, libmysqlclient12-dev,
libmysqlclient14-dev, libmysqlclient14-dev,
libmysqlclient15-dev, libmysqlclient15-dev,
libmysqlclient16-dev libmysqlclient16-dev
Provides: libmysqlclient-dev Provides: libmysqlclient-dev, libmariadbclient-dev
Description: MariaDB database development files Description: MariaDB database development files
MariaDB is a fast, stable and true multi-user, multi-threaded SQL 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 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) ...@@ -153,7 +168,7 @@ Description: MariaDB database common files (e.g. /etc/mysql/conf.d/mariadb.cnf)
Package: mariadb-client-core-10.2 Package: mariadb-client-core-10.2
Architecture: any Architecture: any
Depends: libmariadbclient18 (>= ${source:Version}), Depends: libmariadb3 (>= ${source:Version}),
mariadb-common (>= ${source:Version}), mariadb-common (>= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
...@@ -217,7 +232,7 @@ Description: MariaDB database core client binaries ...@@ -217,7 +232,7 @@ Description: MariaDB database core client binaries
Package: mariadb-client-10.2 Package: mariadb-client-10.2
Architecture: any Architecture: any
Depends: debianutils (>=1.6), Depends: debianutils (>=1.6),
libmariadbclient18 (>= ${source:Version}), libmariadb3 (>= ${source:Version}),
mariadb-client-core-10.2 (>= ${source:Version}), mariadb-client-core-10.2 (>= ${source:Version}),
mariadb-common, mariadb-common,
${misc:Depends}, ${misc:Depends},
...@@ -271,7 +286,7 @@ Description: MariaDB database client binaries ...@@ -271,7 +286,7 @@ Description: MariaDB database client binaries
Package: mariadb-server-core-10.2 Package: mariadb-server-core-10.2
Architecture: any Architecture: any
Depends: libmariadbclient18 (>= ${binary:Version}), Depends: libmariadb3 (>= ${binary:Version}),
mariadb-common (>= ${source:Version}), mariadb-common (>= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
......
...@@ -72,7 +72,7 @@ override_dh_auto_configure: ...@@ -72,7 +72,7 @@ override_dh_auto_configure:
# Remove symbols file on kFreeBSD builds so that # Remove symbols file on kFreeBSD builds so that
# dpkg-gensymbols will not fail the build. # dpkg-gensymbols will not fail the build.
ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64)) ifneq (,$(filter $(ARCH), kfreebsd-i386 kfreebsd-amd64))
rm debian/libmariadbclient18.symbols rm debian/libmariadb3.symbols
endif endif
mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \ mkdir -p $(BUILDDIR) && cd $(BUILDDIR) && \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment