From bccdc72536707480e04b2c5b069eaff873aca80e Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Sat, 18 May 2024 10:01:00 +0300 Subject: [PATCH] MDEV-34191: Make sure that Debian respects systemd disabled Make sure that Debian respects systemd disabled by bumping to deb compat 11 which is available from Debian 10 and Ubuntu 20.04 and it provides better integration with systemd. Start using dh_installsystemd which is new recommended way in compat 11 --- debian/compat | 2 +- debian/rules | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) mode change 100755 => 100644 debian/rules diff --git a/debian/compat b/debian/compat index ec635144f60..b4de3947675 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +11 diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 index 4dbbe68ba23..b24485deb46 --- a/debian/rules +++ b/debian/rules @@ -169,18 +169,12 @@ override_dh_auto_install: mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/ override_dh_installsystemd: - dh_systemd_enable --name=mariadb mariadb.service - dh_systemd_enable --no-enable --name=mariadb mariadb.socket - dh_systemd_enable --no-enable --name=mariadb-extra mariadb-extra.socket - dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket - dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket - dh_systemd_enable --no-enable --name=mariadb@ mariadb@.service + dh_installsystemd -pmariadb-server mariadb.service # Start MariaDB at sequence number 19 before 20 where apache, proftpd etc gets # started which might depend on a running database server. override_dh_installinit-arch: dh_installinit --name=mariadb -- defaults 19 21 - dh_systemd_start --restart-after-upgrade # Use custom server version string variable override_dh_gencontrol: @@ -191,6 +185,6 @@ override_dh_gencontrol: # white list file only starting from Debian Stretch and Ubuntu Xenial. # To find more, grep build logs for 'but is not installed to anywhere'. %: - dh $@ --parallel --with systemd --fail-missing + dh $@ --parallel --fail-missing # vim: ts=8