Move client and server programs with name 'mysql*' to the -compat packages like upstream
See commits for details. Done by comparing git difftool --dir-diff mariadb-11.8.5 -- debian/*.install.
Filelists before vs after these changes:
--- /home/otto/.cache/debcraft/debcraft-build-mariadb-1764464793.a51f2f70f6e+debian.latest/filelist.log 2025-11-29 17:29:10.545376755 -0800
+++ /home/otto/.cache/debcraft/debcraft-build-mariadb-1764475075.2df4c7c9092+feature.compat.like.upstream/filelist.log 2025-11-29 20:19:24.551330910 -0800
@@ -386,6 +386,7 @@
mariadb-client-compat
drwxr-xr-x root/root ./
drwxr-xr-x root/root ./usr/
drwxr-xr-x root/root ./usr/bin/
+lrwxrwxrwx root/root ./usr/bin/mysql -> mariadb
lrwxrwxrwx root/root ./usr/bin/mysql_convert_table_format -> mariadb-convert-table-format
lrwxrwxrwx root/root ./usr/bin/mysql_find_rows -> mariadb-find-rows
lrwxrwxrwx root/root ./usr/bin/mysql_fix_extensions -> mariadb-fix-extensions
@@ -395,9 +396,11 @@
lrwxrwxrwx root/root ./usr/bin/mysql_tzinfo_to_sql -> mariadb-tzinfo-to-sql
lrwxrwxrwx root/root ./usr/bin/mysql_waitpid -> mariadb-waitpid
lrwxrwxrwx root/root ./usr/bin/mysqlaccess -> mariadb-access
+lrwxrwxrwx root/root ./usr/bin/mysqladmin -> mariadb-admin
lrwxrwxrwx root/root ./usr/bin/mysqlanalyze -> mariadb-check
lrwxrwxrwx root/root ./usr/bin/mysqlbinlog -> mariadb-binlog
lrwxrwxrwx root/root ./usr/bin/mysqlcheck -> mariadb-check
+lrwxrwxrwx root/root ./usr/bin/mysqldump -> mariadb-dump
lrwxrwxrwx root/root ./usr/bin/mysqldumpslow -> mariadb-dumpslow
lrwxrwxrwx root/root ./usr/bin/mysqlhotcopy -> mariadb-hotcopy
lrwxrwxrwx root/root ./usr/bin/mysqlimport -> mariadb-import
@@ -413,6 +416,7 @@
-rw-r--r-- root/root ./usr/share/doc/mariadb-client-compat/copyright
drwxr-xr-x root/root ./usr/share/man/
drwxr-xr-x root/root ./usr/share/man/man1/
+-rw-r--r-- root/root ./usr/share/man/man1/mysql.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysql_convert_table_format.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysql_find_rows.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysql_fix_extensions.1.gz
@@ -422,9 +426,11 @@
-rw-r--r-- root/root ./usr/share/man/man1/mysql_tzinfo_to_sql.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysql_waitpid.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqlaccess.1.gz
+-rw-r--r-- root/root ./usr/share/man/man1/mysqladmin.1.gz
lrwxrwxrwx root/root ./usr/share/man/man1/mysqlanalyze.1.gz -> mariadb-check.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqlbinlog.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqlcheck.1.gz
+-rw-r--r-- root/root ./usr/share/man/man1/mysqldump.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqldumpslow.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqlhotcopy.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqlimport.1.gz
@@ -441,7 +447,6 @@
------------------------------------------------
mariadb-client-core
drwxr-xr-x root/root ./
drwxr-xr-x root/root ./usr/
drwxr-xr-x root/root ./usr/bin/
-rwxr-xr-x root/root ./usr/bin/mariadb
-rwxr-xr-x root/root ./usr/bin/mariadb-check
-rwxr-xr-x root/root ./usr/bin/my_print_defaults
-lrwxrwxrwx root/root ./usr/bin/mysql -> mariadb
drwxr-xr-x root/root ./usr/share/
drwxr-xr-x root/root ./usr/share/doc/
drwxr-xr-x root/root ./usr/share/doc/mariadb-client-core/
@@ -455,7 +460,6 @@
-rw-r--r-- root/root ./usr/share/man/man1/mariadb-check.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mariadb.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/my_print_defaults.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysql.1.gz -> mariadb.1.gz
------------------------------------------------
mariadb-client
drwxr-xr-x root/root ./
@@ -492,8 +496,6 @@
-rwxr-xr-x root/root ./usr/bin/mariadb-waitpid
lrwxrwxrwx root/root ./usr/bin/mariadbcheck -> mariadb-check
-rwxr-xr-x root/root ./usr/bin/msql2mysql
-lrwxrwxrwx root/root ./usr/bin/mysqladmin -> mariadb-admin
-lrwxrwxrwx root/root ./usr/bin/mysqldump -> mariadb-dump
-rwxr-xr-x root/root ./usr/bin/mytop
-rwxr-xr-x root/root ./usr/bin/perror
-rwxr-xr-x root/root ./usr/bin/replace
@@ -537,8 +539,6 @@
-rw-r--r-- root/root ./usr/share/man/man1/mariadb-waitpid.1.gz
lrwxrwxrwx root/root ./usr/share/man/man1/mariadbcheck.1.gz -> mariadb-check.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/msql2mysql.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysqladmin.1.gz -> mariadb-admin.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysqldump.1.gz -> mariadb-dump.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mytop.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/perror.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/replace.1.gz
@@ -873,8 +873,13 @@
------------------------------------------------
mariadb-server-compat
drwxr-xr-x root/root ./
drwxr-xr-x root/root ./usr/
drwxr-xr-x root/root ./usr/bin/
+lrwxrwxrwx root/root ./usr/bin/mysql_install_db -> mariadb-install-db
+lrwxrwxrwx root/root ./usr/bin/mysql_upgrade -> mariadb-upgrade
lrwxrwxrwx root/root ./usr/bin/mysqld_multi -> mariadbd-multi
+lrwxrwxrwx root/root ./usr/bin/mysqld_safe -> mariadbd-safe
lrwxrwxrwx root/root ./usr/bin/mysqld_safe_helper -> mariadbd-safe-helper
+drwxr-xr-x root/root ./usr/sbin/
+lrwxrwxrwx root/root ./usr/sbin/mysqld -> mariadbd
drwxr-xr-x root/root ./usr/share/
drwxr-xr-x root/root ./usr/share/doc/
drwxr-xr-x root/root ./usr/share/doc/mariadb-server-compat/
@@ -882,8 +887,13 @@
-rw-r--r-- root/root ./usr/share/doc/mariadb-server-compat/copyright
drwxr-xr-x root/root ./usr/share/man/
drwxr-xr-x root/root ./usr/share/man/man1/
+-rw-r--r-- root/root ./usr/share/man/man1/mysql_install_db.1.gz
+-rw-r--r-- root/root ./usr/share/man/man1/mysql_upgrade.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqld_multi.1.gz
+-rw-r--r-- root/root ./usr/share/man/man1/mysqld_safe.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mysqld_safe_helper.1.gz
+drwxr-xr-x root/root ./usr/share/man/man8/
+-rw-r--r-- root/root ./usr/share/man/man8/mysqld.8.gz
------------------------------------------------
mariadb-server-core
drwxr-xr-x root/root ./
@@ -892,12 +902,9 @@
-rwxr-xr-x root/root ./usr/bin/innochecksum
-rwxr-xr-x root/root ./usr/bin/mariadb-install-db
-rwxr-xr-x root/root ./usr/bin/mariadb-upgrade
-lrwxrwxrwx root/root ./usr/bin/mysql_install_db -> mariadb-install-db
-lrwxrwxrwx root/root ./usr/bin/mysql_upgrade -> mariadb-upgrade
-rwxr-xr-x root/root ./usr/bin/resolveip
drwxr-xr-x root/root ./usr/sbin/
-rwxr-xr-x root/root ./usr/sbin/mariadbd
-lrwxrwxrwx root/root ./usr/sbin/mysqld -> mariadbd
drwxr-xr-x root/root ./usr/share/
drwxr-xr-x root/root ./usr/share/doc/
drwxr-xr-x root/root ./usr/share/doc/mariadb-server-core/
@@ -911,12 +918,9 @@
-rw-r--r-- root/root ./usr/share/man/man1/innochecksum.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mariadb-install-db.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/mariadb-upgrade.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysql_install_db.1.gz -> mariadb-install-db.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysql_upgrade.1.gz -> mariadb-upgrade.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/resolveip.1.gz
drwxr-xr-x root/root ./usr/share/man/man8/
-rw-r--r-- root/root ./usr/share/man/man8/mariadbd.8.gz
-lrwxrwxrwx root/root ./usr/share/man/man8/mysqld.8.gz -> mariadbd.8.gz
drwxr-xr-x root/root ./usr/share/mariadb/
drwxr-xr-x root/root ./usr/share/mariadb/bulgarian/
-rw-r--r-- root/root ./usr/share/mariadb/bulgarian/errmsg.sys
@@ -1050,7 +1054,6 @@
------------------------------------------------
mariadb-server
-rwxr-xr-x root/root ./usr/bin/myisamchk
-rwxr-xr-x root/root ./usr/bin/myisamlog
-rwxr-xr-x root/root ./usr/bin/myisampack
-lrwxrwxrwx root/root ./usr/bin/mysqld_safe -> mariadbd-safe
-rwxr-xr-x root/root ./usr/bin/wsrep_sst_backup
-rwxr-xr-x root/root ./usr/bin/wsrep_sst_common
-rwxr-xr-x root/root ./usr/bin/wsrep_sst_mariabackup
@@ -1133,7 +1141,6 @@
-rw-r--r-- root/root ./usr/share/man/man1/myisamchk.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/myisamlog.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/myisampack.1.gz
-lrwxrwxrwx root/root ./usr/share/man/man1/mysqld_safe.1.gz -> mariadbd-safe.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/wsrep_sst_backup.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/wsrep_sst_common.1.gz
-rw-r--r-- root/root ./usr/share/man/man1/wsrep_sst_mariabackup.1.gzEdited by Otto Kekäläinen