Commit 24ed76b3 authored by Otto Kekäläinen's avatar Otto Kekäläinen

Removed libmariadbclient packages that provided the Debian-only

libmariadbclient.so library that nobody used. Instead developers are
encouraged to use the libraries from the package libmariadb-client-lgpl
instead (Closes: #739452) (Closes: #742172).
parent 88ef15db
......@@ -116,23 +116,6 @@ Test that the patches still apply by running:
If there are any rejects, inspect the files and update the patches.
### Maintaining symbols file for libmariadbclient18 et al ###
Update symbols file:
dpkg-gensymbols -plibmariadbclient18 -Idebian/libmariadbclient18.symbols \
-Pdebian/libmariadbclient18 \
-edebian/libmariadbclient18/usr/lib/mysql/plugin/mysql_clear_password.so \
-edebian/libmariadbclient18/usr/lib/mysql/plugin/dialog.so \
-edebian/libmariadbclient18/usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0 \
> symbols.patch
patch debian/libmariadbclient18.symbols symbols.patch
Finish it manually by e.g. making sure there are no '-1' file versions,
upstream versions is enough. Finally remember to selectively commit:
git add debian/libmariadbclient18.symbols
git commit -m "Updated symbols file"
### Maintaining debian/copyright ###
......
......@@ -12,6 +12,10 @@ mariadb-10.0 (10.0.14-2) UNRELEASED; urgency=low
bundled YaSSL instead (Closes: #761911)
* Fixed debconf value saving (Closes: #761452)
* Re-enabled TokuDB after backporting upstream fix in MDEV-6815
* Removed libmariadbclient packages that provided the Debian-only
libmariadbclient.so library that nobody used. Instead developers are
encouraged to use the libraries from the package libmariadb-client-lgpl
instead (Closes: #739452) (Closes: #742172).
-- Otto Kekäläinen <otto@seravo.fi> Wed, 01 Oct 2014 22:00:11 +0300
......
debian/libmariadbclient18.links
debian/libmariadbclient-dev.links
......@@ -27,26 +27,11 @@ 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: libmariadbclient18
Section: libs
Architecture: any
Depends: mariadb-common, ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
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
language in the world. The main goals of MariaDB are speed, robustness and
ease of use.
.
This package includes the client library.
Package: libmariadbd-dev
Architecture: any
Section: libdevel
Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadbclient-dev (>= ${source:Version}),
${misc:Depends},
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: libmysqld-dev
Replaces: libmysqld-dev
......@@ -58,24 +43,6 @@ Description: MariaDB embedded database development files
.
This package includes the embedded server library and header files.
Package: libmariadbclient-dev
Architecture: any
Section: libdevel
Pre-Depends: ${misc:Pre-Depends}
Depends: libmariadbclient18 (= ${binary:Version}),
zlib1g-dev,
${misc:Depends},
${shlibs:Depends}
Breaks: libmysqlclient-dev
Replaces: libmysqlclient-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
language in the world. The main goals of MariaDB are speed, robustness and
ease of use.
.
This package includes development libraries and header files.
Package: mariadb-common
Architecture: all
Depends: mysql-common, ${misc:Depends}
......@@ -91,8 +58,7 @@ Description: MariaDB common metapackage
Package: mariadb-client-core-10.0
Architecture: any
Depends: libmariadbclient18 (>= ${source:Version}),
mariadb-common,
Depends: mariadb-common,
${misc:Depends},
${shlibs:Depends}
Conflicts: mysql-client-5.5, mysql-client-5.6
......
The examples directory includes files that might be needed by some
developers:
- header files not installed by default
- the example file udf_example.c
usr/bin/mysql_config
usr/include/mysql/*
usr/lib/*/libmariadbclient.a
usr/lib/*/libmariadbclient.so
usr/lib/*/libmariadbclient_r.a
usr/lib/*/libmariadbclient_r.so*
usr/lib/*/libmysqlservices.a
usr/share/aclocal/mysql.m4
debian/tmp/usr/share/man/man1/mysql_config.1
usr/lib/*/libmariadbclient.so.*
usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/mysql_clear_password.so
# OK, file names don't conflict with the MySQL version
libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/dialog.so
libmariadbclient18: arch-dependent-file-not-in-arch-specific-directory usr/lib/mysql/plugin/mysql_clear_password.so
# embedded libs are OK
libmariadbclient18: embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
This diff is collapsed.
......@@ -9,11 +9,11 @@ diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.
# Create options
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
-libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmariadbclient"
+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
-embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmariadbclient_r @CLIENT_LIBS@ @openssl_libs@ "
+libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @CLIENT_LIBS@ @openssl_libs@ "
+embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @WRAPLIBS@ @openssl_libs@ "
if [ -r "$pkglibdir/libmygcc.a" ]; then
......
......@@ -93,23 +93,6 @@ override_dh_auto_configure:
@echo "RULES.$@"
dh_testdir
# Versioned symbols are only available on Linux.
# 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
endif
# Rename shared libraries SONAME and filenames
# libmysqlclient18.so > libmariadbclient18.so etc
sed -i 's/mysqlclient/mariadbclient/g' client/CMakeLists.txt tests/CMakeLists.txt scripts/CMakeLists.txt unittest/mysys/CMakeLists.txt
sed -i 's/mysqlclient/mariadbclient/g' libmysql/CMakeLists.txt libmysql/libmysql_versions.ld.in
sed -i 's/mysqlclient/mariadbclient/g' man/mysql_config.1
sed -i 's/mysqlclient/mariadbclient/g' scripts/make_win_bin_dist scripts/mysql_config.sh scripts/mysql_config.pl.in
# Patch 44_scripts__mysql_config__libs also contains 'mysqlclient' but is compatible with this
# Stuff in storage/ndb/* is not compiled, no need to sed it.
# Neither does RPM packaging related files or comments in other code need sedding.
( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \
......
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