Skip to content

Commit

Permalink
Deb: Move my_print_defaults to MariaDB client core package
Browse files Browse the repository at this point in the history
The my_print_default is required by mytop which is also in the MariaDB
client package, which in turn requires the client core package.
This way it is ensured my_print_deafult is always available when mytop
is installed.

The my_print_defaults is also required by the server logrotate files
and mysqld_safe script etc, but this change is fine, since the server
core package always depends on the MariaDB client core package anyway
and they are both installed on server installations.

Related: #1566

Closes 1581
  • Loading branch information
ottok authored and an3l committed Aug 2, 2020
1 parent b09faf8 commit 87f91f4
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
25 changes: 24 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,18 @@ Conflicts: mariadb-client-10.0,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
virtual-mysql-client-core
Breaks: mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
mariadb-server-core-10.3,
mariadb-server-core-10.4,
mariadb-server-core-10.5 (<< ${source:Version}),
mariadb-server-core-5.5
Replaces: mariadb-client-10.0,
mariadb-client-10.1,
mariadb-client-10.2,
Expand All @@ -302,6 +313,13 @@ Replaces: mariadb-client-10.0,
mariadb-client-core-5.2,
mariadb-client-core-5.3,
mariadb-client-core-5.5,
mariadb-server-core-10.0,
mariadb-server-core-10.1,
mariadb-server-core-10.2,
mariadb-server-core-10.3,
mariadb-server-core-10.4,
mariadb-server-core-10.5 (<< ${source:Version}),
mariadb-server-core-5.5,
mysql-client (<< 5.0.51),
mysql-client-5.0,
mysql-client-5.1,
Expand All @@ -311,6 +329,10 @@ Replaces: mariadb-client-10.0,
mysql-client-core-5.6,
mysql-client-core-5.7,
mysql-client-core-8.0,
mysql-server-core-5.5,
mysql-server-core-5.6,
mysql-server-core-5.7,
mysql-server-core-8.0,
virtual-mysql-client-core
Provides: default-mysql-client-core,
virtual-mysql-client-core
Expand Down Expand Up @@ -411,7 +433,8 @@ Description: MariaDB database client binaries

Package: mariadb-server-core-10.5
Architecture: any
Depends: mariadb-common (>= ${source:Version}),
Depends: mariadb-client-core-10.5 (>= ${source:Version}),
mariadb-common (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Conflicts: mariadb-server-core-10.0,
Expand Down
2 changes: 2 additions & 0 deletions debian/mariadb-client-core-10.5.install
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
usr/bin/mariadb
usr/bin/mariadb-check
usr/bin/my_print_defaults
usr/share/man/man1/mariadb-check.1
usr/share/man/man1/mariadb.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/mysql.1
usr/share/man/man1/mysqlcheck.1
2 changes: 0 additions & 2 deletions debian/mariadb-server-core-10.5.install
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
usr/bin/innochecksum
usr/bin/mariadb-install-db
usr/bin/mariadb-upgrade
usr/bin/my_print_defaults
usr/bin/resolveip
usr/sbin/mariadbd
usr/share/man/man1/innochecksum.1
usr/share/man/man1/mariadb-install-db.1
usr/share/man/man1/mariadb-upgrade.1
usr/share/man/man1/my_print_defaults.1
usr/share/man/man1/mysql_install_db.1
usr/share/man/man1/mysql_upgrade.1
usr/share/man/man1/resolveip.1
Expand Down

0 comments on commit 87f91f4

Please sign in to comment.