summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2020-01-16 12:10:36 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2020-01-16 12:11:35 +0100
commit11cd71b567639a37b46f5c61f4b790e51aa0a0c4 (patch)
treee43b0a9b83c31fac7f11f32b54b768fbe28384ed /debian
parentea4b7921b7e3eadb42be1deab5f343dbba8f29df (diff)
Fix debian-rules-uses-deprecated-systemd-override
We accidentally managed to restart apt-daily{,-upgrade}.service again because our dh_systemd_start override was being ignored since we switched to debhelper 12. Override dh_installsystemd instead. Gbp-Dch: full
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/rules7
1 files changed, 4 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules
index a4935b962..7997739fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,12 +37,13 @@ override_dh_gencontrol:
override_dh_installcron:
dh_installcron --name=apt-compat
-override_dh_systemd_start:
+override_dh_installsystemd:
# Do not restart "apt-daily.service" because this script runs
# unattended-upgrades. So if apt itself is upgraded as part of
# an unattended-upgrades run it would kill itself
- dh_systemd_start -papt apt-daily.timer apt-daily-upgrade.timer
- dh_systemd_start --remaining-packages
+ dh_installsystemd -papt apt-daily.timer apt-daily-upgrade.timer
+ dh_installsystemd -papt --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily.service apt-daily-upgrade.service
+ dh_installsystemd --remaining-packages
override_dh_auto_configure-arch: flags=-DWITH_DOC=OFF
override_dh_auto_configure-indep: flags=-DWITH_DOC=ON