Skip to content
Commits on Source (1)
  • Otto Kekäläinen's avatar
    Make libmariadb3 file names consistent · 88b474f7
    Otto Kekäläinen authored 
    Now all libmariadb-dev filename have 'mariadb', not 'mysql' nor
'mariadbclient'. The files with 'mysql' names will still work if user
installs the libmariadb-dev-compat package.

- Rename libmariadbclient.a to libmariadb.a (symmetric to libmariadb.so)
  and replace old file with symlink.
- Rename libmysqlservices.a to libmariadbservices.a and replace old file
  with symlink that is shipped in compat package.
- Rename mysql.m4 to mariadb.m4 and replace old file with symlink that
  is shipped in compat package.
- Rename mysql_config.1 to mariadb_config.1 and replace old file with
  symlink that is shipped in compat package. Rename must be done really to
  the original file so that later dh_manpages and dh_install see the real
  manpage and work correctly.
- Add correct Breaks/Replaces for so that upgrades to updated
  libmariadb-dev-compat works and that it does not conflict with its own
  dependency libmariadb-dev in current version
- In MariaDB 10.4 a separate mysql_config is built, so use it instead of
  symlink to mariadb_config.
    88b474f7
Hide whitespace changes
Inline Side-by-side
debian/control
View file @ 88b474f7
......@@ -94,13 +94,17 @@ Conflicts: libmariadb-client-lgpl-dev-compat,
Provides: libmariadb-client-lgpl-dev-compat,
libmariadbclient-dev-compat
Breaks: libmariadb-client-lgpl-dev-compat,
libmariadb-dev (<< 1:10.4),
libmariadbclient-dev (<< 1:10.3),
libmariadbclient-dev-compat,
libmysqlclient-dev
libmysqlclient-dev,
libmysqld-dev
Replaces: libmariadb-client-lgpl-dev-compat,
libmariadb-dev (<< 1:10.4),
libmariadbclient-dev (<< 1:10.3),
libmariadbclient-dev-compat,
libmysqlclient-dev
libmysqlclient-dev,
libmysqld-dev
Description: MariaDB Connector/C, compatibility symlinks
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
......
debian/libmariadb-dev-compat.install
View file @ 88b474f7
usr/bin/mysql_config
usr/lib/*/libmysqlclient.a
usr/lib/*/libmysqlclient.so
usr/lib/*/libmysqlclient_r.a
......
debian/libmariadb-dev-compat.links
View file @ 88b474f7
#!/usr/bin/dh-exec
usr/bin/mariadb_config usr/bin/mysql_config
usr/include/mariadb usr/include/mysql
usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc
usr/lib/${DEB_HOST_MULTIARCH}/libmariadbservices.a usr/lib/${DEB_HOST_MULTIARCH}/libmysqlservices.a
usr/share/aclocal/mariadb.m4 usr/share/aclocal/mysql.m4
usr/share/man/man1/mariadb_config.1.gz usr/share/man/man1/mysql_config.1.gz
debian/libmariadb-dev.install
View file @ 88b474f7
......@@ -24,10 +24,11 @@ usr/include/mariadb/mysql_com.h
usr/include/mariadb/mysql_version.h
usr/include/mariadb/mysqld_error.h
usr/lib/*/libmariadb.so
usr/lib/*/libmariadbclient.a
usr/lib/${DEB_HOST_MULTIARCH}/libmariadbclient.a => usr/lib/${DEB_HOST_MULTIARCH}/libmariadb.a
usr/lib/*/libmariadbclient.so
usr/lib/*/libmysqlservices.a
usr/share/aclocal/mysql.m4
usr/share/man/man1/mysql_config.1
usr/lib/${DEB_HOST_MULTIARCH}/libmysqlservices.a => usr/lib/${DEB_HOST_MULTIARCH}/libmariadbservices.a
usr/share/aclocal/mysql.m4 => usr/share/aclocal/mariadb.m4
usr/share/man/man1/mariadb_config.1
usr/share/man/man1/mariadb-config.1
usr/lib/pkgconfig/libmariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
usr/lib/*/pkgconfig/mariadb.pc
debian/libmariadb-dev.links 100644 → 100755
View file @ 88b474f7
usr/share/man/man1/mysql_config.1.gz usr/share/man/man1/mariadb_config.1.gz
#!/usr/bin/dh-exec
usr/lib/${DEB_HOST_MULTIARCH}/libmariadb.a usr/lib/${DEB_HOST_MULTIARCH}/libmariadbclient.a
usr/bin/mariadb_config usr/bin/mariadb-config
debian/not-installed
View file @ 88b474f7
......@@ -5,7 +5,6 @@ etc/mysql/conf.d/enable_encryption.preset
etc/mysql/conf.d/mysql-clients.cnf
etc/mysql/conf.d/server.cnf
usr/bin/mysqlbug
usr/bin/mysql_config
usr/bin/sst_dump
usr/bin/test-connect-t
usr/bin/wsrep_sst_xtrabackup
......
debian/patches/mariadb_config-manpage-filename.patch 0 → 100644
View file @ 88b474f7
Subject: [PATCH] Rename man page mysql_config.1 to mariadb_config.1 just like the binary is renamed to mariadb_config
Author: Otto Kekäläinen <otto@debian.org>
Forwarded: TODO for MariaDB 10.5
--- /dev/null
+++ b/man/mariadb_config.1
@@ -0,0 +1,247 @@
+'\" t
+.\"
+.TH "\FBMYSQL_CONFIG\FR" "1" "28 March 2019" "MariaDB 10\&.4" "MariaDB Database System"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.\" mysql_config
+.SH "NAME"
+mysql_config \- get compile options for compiling clients
+.SH "SYNOPSIS"
+.HP \w'\fBmysql_config\ \fR\fB\fIoptions\fR\fR\ 'u
+\fBmysql_config \fR\fB\fIoptions\fR\fR
+.SH "DESCRIPTION"
+.PP
+\fBmysql_config\fR
+provides you with useful information for compiling your MariaDB client and connecting it to MariaDB\&.
+.PP
+\fBmysql_config\fR
+supports the following options\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: cflags option
+.\" cflags option: mysql_config
+\fB\-\-cflags\fR
+.sp
+Compiler flags to find include files and critical compiler flags and defines used when compiling the
+libmysqlclient
+library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
+\fB\-\-include\fR
+for more portable options that contain only include paths\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: include option
+.\" include option: mysql_config
+\fB\-\-include\fR
+.sp
+Compiler options to find MariaDB include files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: libmysqld-libs option
+.\" libmysqld-libs option: mysql_config
+.\" mysql_config: embedded option
+.\" embedded option: mysql_config
+\fB\-\-libmysqld\-libs\fR,
+\fB\-\-embedded\fR
+.sp
+Libraries and options required to link with the MariaDB embedded server\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: libs option
+.\" libs option: mysql_config
+\fB\-\-libs\fR
+.sp
+Libraries and options required to link with the MariaDB client library\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: libs_r option
+.\" libs_r option: mysql_config
+\fB\-\-libs_r\fR
+.sp
+Libraries and options required to link with the thread\-safe MariaDB client library\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: plugindir option
+.\" plugindir option: mysql_config
+\fB\-\-plugindir\fR
+.sp
+The default plugin directory path name, defined when configuring MariaDB\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: port option
+.\" port option: mysql_config
+\fB\-\-port\fR
+.sp
+The default TCP/IP port number, defined when configuring MariaDB\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: socket option
+.\" socket option: mysql_config
+\fB\-\-socket\fR
+.sp
+The default Unix socket file, defined when configuring MariaDB\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: variable option
+.\" variable option: mysql_config
+\fB\-\-variable=VAR\fR
+.sp
+Path to MariaDB include, library and plugin directories\&. \fBVAR\fR is one of
+`pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_config: version option
+.\" version option: mysql_config
+\fB\-\-version\fR
+.sp
+Version number for the MariaDB distribution\&.
+.RE
+.PP
+If you invoke
+\fBmysql_config\fR
+with no options, it displays a list of all options that it supports, and their values:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBmysql_config\fR
+Usage: /usr/local/mysql/bin/mysql_config [options]
+Options:
+ \-\-cflags [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
+ \-\-include [\-I/usr/local/mysql/include/mysql]
+ \-\-libs [\-L/usr/local/mysql/lib/mysql \-lmysqlclient \-lz
+ \-lcrypt \-lnsl \-lm \-L/usr/lib \-lssl \-lcrypto]
+ \-\-libs_r [\-L/usr/local/mysql/lib/mysql \-lmysqlclient_r
+ \-lpthread \-lz \-lcrypt \-lnsl \-lm \-lpthread]
+ \-\-socket [/tmp/mysql\&.sock]
+ \-\-port [3306]
+ \-\-version [4\&.0\&.16]
+ \-\-libmysqld\-libs [\-L/usr/local/mysql/lib/mysql \-lmysqld \-lpthread \-lz
+ \-lcrypt \-lnsl \-lm \-lpthread \-lrt]
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+You can use
+\fBmysql_config\fR
+within a command line to include the value that it displays for a particular option\&. For example, to compile a MariaDB client program, use
+\fBmysql_config\fR
+as follows:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBCFG=/usr/local/mysql/bin/mysql_config\fR
+shell> \fBsh \-c "gcc \-o progname `$CFG \-\-include` progname\&.c `$CFG \-\-libs`"\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+When you use
+\fBmysql_config\fR
+this way, be sure to invoke it within backtick (\(lq`\(rq) characters\&. That tells the shell to execute it and substitute its output into the surrounding command\&.
+.SH "COPYRIGHT"
+.br
+.PP
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
+.PP
+This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+.PP
+This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+.PP
+You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/.
+.sp
+.SH "SEE ALSO"
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
+.SH AUTHOR
+MariaDB Foundation (http://www.mariadb.org/).
--- a/man/mysql_config.1
+++ /dev/null
@@ -1,247 +0,0 @@
-'\" t
-.\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "28 March 2019" "MariaDB 10\&.4" "MariaDB Database System"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.\" mysql_config
-.SH "NAME"
-mysql_config \- get compile options for compiling clients
-.SH "SYNOPSIS"
-.HP \w'\fBmysql_config\ \fR\fB\fIoptions\fR\fR\ 'u
-\fBmysql_config \fR\fB\fIoptions\fR\fR
-.SH "DESCRIPTION"
-.PP
-\fBmysql_config\fR
-provides you with useful information for compiling your MariaDB client and connecting it to MariaDB\&.
-.PP
-\fBmysql_config\fR
-supports the following options\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: cflags option
-.\" cflags option: mysql_config
-\fB\-\-cflags\fR
-.sp
-Compiler flags to find include files and critical compiler flags and defines used when compiling the
-libmysqlclient
-library\&. The options returned are tied to the specific compiler that was used when the library was created and might clash with the settings for your own compiler\&. Use
-\fB\-\-include\fR
-for more portable options that contain only include paths\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: include option
-.\" include option: mysql_config
-\fB\-\-include\fR
-.sp
-Compiler options to find MariaDB include files\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: libmysqld-libs option
-.\" libmysqld-libs option: mysql_config
-.\" mysql_config: embedded option
-.\" embedded option: mysql_config
-\fB\-\-libmysqld\-libs\fR,
-\fB\-\-embedded\fR
-.sp
-Libraries and options required to link with the MariaDB embedded server\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: libs option
-.\" libs option: mysql_config
-\fB\-\-libs\fR
-.sp
-Libraries and options required to link with the MariaDB client library\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: libs_r option
-.\" libs_r option: mysql_config
-\fB\-\-libs_r\fR
-.sp
-Libraries and options required to link with the thread\-safe MariaDB client library\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: plugindir option
-.\" plugindir option: mysql_config
-\fB\-\-plugindir\fR
-.sp
-The default plugin directory path name, defined when configuring MariaDB\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: port option
-.\" port option: mysql_config
-\fB\-\-port\fR
-.sp
-The default TCP/IP port number, defined when configuring MariaDB\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: socket option
-.\" socket option: mysql_config
-\fB\-\-socket\fR
-.sp
-The default Unix socket file, defined when configuring MariaDB\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: variable option
-.\" variable option: mysql_config
-\fB\-\-variable=VAR\fR
-.sp
-Path to MariaDB include, library and plugin directories\&. \fBVAR\fR is one of
-`pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql_config: version option
-.\" version option: mysql_config
-\fB\-\-version\fR
-.sp
-Version number for the MariaDB distribution\&.
-.RE
-.PP
-If you invoke
-\fBmysql_config\fR
-with no options, it displays a list of all options that it supports, and their values:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBmysql_config\fR
-Usage: /usr/local/mysql/bin/mysql_config [options]
-Options:
- \-\-cflags [\-I/usr/local/mysql/include/mysql \-mcpu=pentiumpro]
- \-\-include [\-I/usr/local/mysql/include/mysql]
- \-\-libs [\-L/usr/local/mysql/lib/mysql \-lmysqlclient \-lz
- \-lcrypt \-lnsl \-lm \-L/usr/lib \-lssl \-lcrypto]
- \-\-libs_r [\-L/usr/local/mysql/lib/mysql \-lmysqlclient_r
- \-lpthread \-lz \-lcrypt \-lnsl \-lm \-lpthread]
- \-\-socket [/tmp/mysql\&.sock]
- \-\-port [3306]
- \-\-version [4\&.0\&.16]
- \-\-libmysqld\-libs [\-L/usr/local/mysql/lib/mysql \-lmysqld \-lpthread \-lz
- \-lcrypt \-lnsl \-lm \-lpthread \-lrt]
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-You can use
-\fBmysql_config\fR
-within a command line to include the value that it displays for a particular option\&. For example, to compile a MariaDB client program, use
-\fBmysql_config\fR
-as follows:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-shell> \fBCFG=/usr/local/mysql/bin/mysql_config\fR
-shell> \fBsh \-c "gcc \-o progname `$CFG \-\-include` progname\&.c `$CFG \-\-libs`"\fR
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-When you use
-\fBmysql_config\fR
-this way, be sure to invoke it within backtick (\(lq`\(rq) characters\&. That tells the shell to execute it and substitute its output into the surrounding command\&.
-.SH "COPYRIGHT"
-.br
-.PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
-.PP
-This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-.PP
-This documentation is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA or see http://www.gnu.org/licenses/.
-.sp
-.SH "SEE ALSO"
-For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
-.SH AUTHOR
-MariaDB Foundation (http://www.mariadb.org/).
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -34,7 +34,7 @@ SET(MAN1_CLIENT msql2mysql.1 mysql.1 mys
mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mytop.1
mysql_plugin.1 mysql_embedded.1)
-SET(MAN1_DEVEL mysql_config.1)
+SET(MAN1_DEVEL mariadb_config.1)
SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
mysqltest_embedded.1 mysql_client_test_embedded.1 my_safe_process.1)
debian/patches/series
View file @ 88b474f7
......@@ -23,3 +23,4 @@ prevent-executable-stack-due-to-objects-compiled-fro.patch
mariadb-pc-arch-dependent.patch
1460.patch
1459.patch
mariadb_config-manpage-filename.patch