MDEV-6284: Correctly place files in libmariadb-dev, libmariadbd-dev etc packages

- Make full contents, also header files, explicit in -dev packages
  fb77df0c75
- Don't ship private header files at all.
- Ship both libmariadb.pc and maridb.pc.
- Ship mysql_config only as a symlink.
- Keep 'mariadbcheck' as symlink as somebody could have used it already
  d0466f74d5
- The mariadb.pc is the server pkg-config, ship in libmariadbd-dev.
- The client pkg-config is called libmariadb.pc. Ship only it in the client
  library packages.

Use versioned breaks/replaces for mysql* packages we also provide and fix:

  [ERROR] libmariadb-dev conflicts with libmysqlclient-dev files:
    {'/usr/share/man/man1/mysql_config.1.gz', '/usr/share/aclocal/mysql.m4'}
  [ERROR] libmariadb-dev conflicts with libmysqld-dev files:
    {'/usr/lib/x86_64-linux-gnu/libmysqlservices.a'}

debian/control

@@ -49,10 +49,14 @@ Depends: libmariadb3 (= ${binary:Version}),
          zlib1g-dev,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: libmariadbclient-dev
-Replaces: libmariadbclient-dev
 Conflicts: libmariadbclient16-dev
 Provides: libmariadbclient-dev
+Breaks: libmariadbclient-dev,
+        libmysqlclient-dev (<< ${source:Version}),
+        libmysqld-dev (<< ${source:Version})
+Replaces: libmariadbclient-dev,
+          libmysqlclient-dev (<< ${source:Version}),
+          libmysqld-dev (<< ${source:Version})
 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
@@ -198,8 +202,12 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: libmariadb-dev (= ${binary:Version}),
          libmariadbd19 (= ${binary:Version}),
          ${misc:Depends}
-Breaks: libmysqld-dev
-Replaces: libmysqld-dev
+Breaks: libmariadb-dev (<< ${source:Version}),
+        libmariadbclient-dev (<< ${source:Version}),
+        libmysqld-dev
+Replaces: libmariadb-dev (<< ${source:Version}),
+          libmariadbclient-dev (<< ${source:Version}),
+          libmysqld-dev
 Description: MariaDB embedded 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

debian/libmariadb-dev-compat.install

@@ -1,4 +1,3 @@
-usr/bin/mysql_config
 usr/lib/*/libmysqlclient.a
 usr/lib/*/libmysqlclient.so
 usr/lib/*/libmysqlclient_r.a

debian/libmariadb-dev-compat.links

@@ -1,3 +1,4 @@
 #!/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}/pkgconfig/libmariadb.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/mysqlclient.pc

debian/libmariadb-dev.install

@@ -1,11 +1,33 @@
 usr/bin/mariadb_config
-usr/include/mariadb
+usr/include/mariadb/errmsg.h
+usr/include/mariadb/ma_list.h
+usr/include/mariadb/ma_pvio.h
+usr/include/mariadb/ma_tls.h
+usr/include/mariadb/mariadb/
+usr/include/mariadb/mariadb/ma_io.h
+usr/include/mariadb/mariadb_com.h
+usr/include/mariadb/mariadb_ctype.h
+usr/include/mariadb/mariadb_dyncol.h
+usr/include/mariadb/mariadb_rpl.h
+usr/include/mariadb/mariadb_stmt.h
+usr/include/mariadb/mariadb_version.h
+usr/include/mariadb/my_config.h
+usr/include/mariadb/my_global.h
+usr/include/mariadb/my_sys.h
+usr/include/mariadb/mysql.h
+usr/include/mariadb/mysql/
+usr/include/mariadb/mysql/client_plugin.h
+usr/include/mariadb/mysql/plugin_auth.h
+usr/include/mariadb/mysql/plugin_auth_common.h
+usr/include/mariadb/mysql_com.h
+usr/include/mariadb/mysql_version.h
+usr/include/mariadb/mysqld_error.h
 usr/lib/*/libmariadb.a
 usr/lib/*/libmariadb.so
 usr/lib/*/libmariadbclient.a
 usr/lib/*/libmariadbclient.so
 usr/lib/*/libmysqlservices.a
-usr/lib/*/pkgconfig/mariadb.pc
+usr/lib/*/pkgconfig/libmariadb.pc
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mariadb_config.1
 usr/share/man/man1/mysql_config.1

debian/libmariadbd-dev.install

@@ -1,4 +1,6 @@
+usr/include/mariadb/server
 usr/lib/*/libmariadbd.a
 usr/lib/*/libmariadbd.so
 usr/lib/*/libmysqld.a
 usr/lib/*/libmysqld.so
+usr/lib/*/pkgconfig/mariadb.pc

debian/mariadb-client-10.5.links

@@ -3,7 +3,9 @@ usr/bin/mariadb-admin usr/bin/mysqladmin
 usr/bin/mariadb-check usr/bin/mariadb-analyze
 usr/bin/mariadb-check usr/bin/mariadb-optimize
 usr/bin/mariadb-check usr/bin/mariadb-repair
+usr/bin/mariadb-check usr/bin/mariadbcheck
 usr/bin/mariadb-check usr/bin/mysqlanalyze
+usr/bin/mariadb-check usr/bin/mysqlcheck
 usr/bin/mariadb-check usr/bin/mysqloptimize
 usr/bin/mariadb-check usr/bin/mysqlrepair
 usr/bin/mariadb-dump usr/bin/mysqldump
@@ -18,6 +20,7 @@ usr/bin/mariadb-waitpid usr/bin/mysql_waitpid
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-analyze.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-optimize.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadb-repair.1.gz
+usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mariadbcheck.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlanalyze.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqloptimize.1.gz
 usr/share/man/man1/mariadb-check.1.gz usr/share/man/man1/mysqlrepair.1.gz

debian/mariadb-client-core-10.5.links

@@ -1,2 +1 @@
 usr/bin/mariadb usr/bin/mysql
-usr/bin/mariadb-check usr/bin/mysqlcheck

debian/rules

@@ -125,6 +125,9 @@ endif
 	# If mariadb-test package is removed, also remove most of it's files
 	grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test
 
+	# Delete private files from libraries so they don't get shipped in the -dev pacakges
+	rm -r $(TMP)/usr/include/mariadb/server/private
+
 	# nm numeric soft is not enough, therefore extra sort in command
 	# to satisfy Debian reproducible build requirements
 	nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.5/mysqld.sym.gz