diff -Nru update-notifier-3.192.30.1/debian/changelog update-notifier-3.192.30.2/debian/changelog --- update-notifier-3.192.30.1/debian/changelog 2020-09-11 22:40:03.000000000 +0100 +++ update-notifier-3.192.30.2/debian/changelog 2020-11-06 15:56:19.000000000 +0000 @@ -1,3 +1,19 @@ +update-notifier (3.192.30.2) focal; urgency=medium + + * Replace cronjobs with systemd timers. (LP: #1836475) + * d/control: + - Removed (now) redundant anacron dep + - Bumped Standards-Version + - Removed redundant autotools-dev dep and X-Python3-Version spec + * d/update-notifier-common.maintscript: + - Added rm_conffile for former cronjobs + - Migrated rm_conffile cpu-checker bits from postinst/postrm/preinst + * d/update-notifier-common.triggers: + - Switched to interest-noawait as trigger is "non-crucial" (shouldn't + block configuration of triggering packages) + + -- Dave Jones Fri, 06 Nov 2020 15:56:19 +0000 + update-notifier (3.192.30.1) focal; urgency=medium [ Chad Smith ] diff -Nru update-notifier-3.192.30.1/debian/control update-notifier-3.192.30.2/debian/control --- update-notifier-3.192.30.1/debian/control 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/control 2020-11-06 15:56:19.000000000 +0000 @@ -11,7 +11,6 @@ libnotify-dev (>= 0.7), libgudev-1.0-dev, libx11-dev, - autotools-dev, libappindicator3-dev, lsb-release, po-debconf, @@ -20,10 +19,9 @@ python3-debconf, python3-debian, python3-mock -Standards-Version: 3.9.4 -Vcs-Git: https://git.launchpad.net/update-notifier +Standards-Version: 4.5.0 +Vcs-Git: https://git.launchpad.net/update-notifier -b master XS-Testsuite: autopkgtest -X-Python3-Version: >= 3.2 Package: update-notifier Architecture: any @@ -38,7 +36,6 @@ Recommends: apport-gtk (>=2.8-0ubuntu3), python3-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), software-properties-gtk, - anacron, python3-aptdaemon Description: Daemon which notifies about package updates Puts an icon in the user's notification area when package updates are diff -Nru update-notifier-3.192.30.1/debian/systemd/update-notifier-download.service update-notifier-3.192.30.2/debian/systemd/update-notifier-download.service --- update-notifier-3.192.30.1/debian/systemd/update-notifier-download.service 1970-01-01 01:00:00.000000000 +0100 +++ update-notifier-3.192.30.2/debian/systemd/update-notifier-download.service 2020-11-06 15:56:19.000000000 +0000 @@ -0,0 +1,7 @@ +[Unit] +Description=Download data for packages that failed at package install time +ConditionFileIsExecutable=/usr/lib/update-notifier/package-data-downloader + +[Service] +ExecStart=/usr/lib/update-notifier/package-data-downloader +Type=oneshot diff -Nru update-notifier-3.192.30.1/debian/systemd/update-notifier-download.timer update-notifier-3.192.30.2/debian/systemd/update-notifier-download.timer --- update-notifier-3.192.30.1/debian/systemd/update-notifier-download.timer 1970-01-01 01:00:00.000000000 +0100 +++ update-notifier-3.192.30.2/debian/systemd/update-notifier-download.timer 2020-11-06 15:56:19.000000000 +0000 @@ -0,0 +1,10 @@ +[Unit] +Description=Download data for packages that failed at package install time +After=network.target network-online.target systemd-networkd.service NetworkManager.service connman.service + +[Timer] +OnStartupSec=5m +OnUnitActiveSec=24h + +[Install] +WantedBy=timers.target diff -Nru update-notifier-3.192.30.1/debian/systemd/update-notifier-motd.service update-notifier-3.192.30.2/debian/systemd/update-notifier-motd.service --- update-notifier-3.192.30.1/debian/systemd/update-notifier-motd.service 1970-01-01 01:00:00.000000000 +0100 +++ update-notifier-3.192.30.2/debian/systemd/update-notifier-motd.service 2020-11-06 15:56:19.000000000 +0000 @@ -0,0 +1,7 @@ +[Unit] +Description=Check to see whether there is a new version of Ubuntu available +ConditionFileIsExecutable=/usr/lib/ubuntu-release-upgrader/release-upgrade-motd + +[Service] +ExecStart=/usr/lib/ubuntu-release-upgrader/release-upgrade-motd +Type=oneshot diff -Nru update-notifier-3.192.30.1/debian/systemd/update-notifier-motd.timer update-notifier-3.192.30.2/debian/systemd/update-notifier-motd.timer --- update-notifier-3.192.30.1/debian/systemd/update-notifier-motd.timer 1970-01-01 01:00:00.000000000 +0100 +++ update-notifier-3.192.30.2/debian/systemd/update-notifier-motd.timer 2020-11-06 15:56:19.000000000 +0000 @@ -0,0 +1,11 @@ +[Unit] +Description=Check to see whether there is a new version of Ubuntu available +After=network.target network-online.target systemd-networkd.service NetworkManager.service connman.service + +[Timer] +OnCalendar=Sun *-*-* 06:00:00 +RandomizedDelaySec=1w +Persistent=true + +[Install] +WantedBy=timers.target diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.cron.daily update-notifier-3.192.30.2/debian/update-notifier-common.cron.daily --- update-notifier-3.192.30.1/debian/update-notifier-common.cron.daily 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.cron.daily 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -[ -x /usr/lib/update-notifier/package-data-downloader ] || exit 0 - -# Try to rerun any package data downloads that failed at package install time. -/usr/lib/update-notifier/package-data-downloader diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.cron.weekly update-notifier-3.192.30.2/debian/update-notifier-common.cron.weekly --- update-notifier-3.192.30.1/debian/update-notifier-common.cron.weekly 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.cron.weekly 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -[ -x /usr/lib/ubuntu-release-upgrader/release-upgrade-motd ] || exit 0 - -# Check to see whether there is a new version of Ubuntu available -/usr/lib/ubuntu-release-upgrader/release-upgrade-motd diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.install update-notifier-3.192.30.2/debian/update-notifier-common.install --- update-notifier-3.192.30.1/debian/update-notifier-common.install 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.install 2020-11-06 15:56:19.000000000 +0000 @@ -14,3 +14,8 @@ usr/lib/update-notifier/ usr/share/locale debian/update-manager-downloader-fix2.diff usr/share/update-notifier/upgrader-patches +# systemd timers +debian/systemd/update-notifier-motd.service lib/systemd/system +debian/systemd/update-notifier-motd.timer lib/systemd/system +debian/systemd/update-notifier-download.service lib/systemd/system +debian/systemd/update-notifier-download.timer lib/systemd/system diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.maintscript update-notifier-3.192.30.2/debian/update-notifier-common.maintscript --- update-notifier-3.192.30.1/debian/update-notifier-common.maintscript 1970-01-01 01:00:00.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.maintscript 2020-11-06 15:56:19.000000000 +0000 @@ -0,0 +1,6 @@ +# Remove update-motd cpu-checker script +rm_conffile /etc/update-motd.d/20-cpu-checker 0.110.1ubuntu1 + +# Remove cronjobs (replaced by systemd timers) +rm_conffile /etc/cron.daily/update-notifier-common 3.192.34~ +rm_conffile /etc/cron.weekly/update-notifier-common 3.192.34~ diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.postinst update-notifier-3.192.30.2/debian/update-notifier-common.postinst --- update-notifier-3.192.30.1/debian/update-notifier-common.postinst 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.postinst 2020-11-06 15:56:19.000000000 +0000 @@ -28,8 +28,4 @@ # depending on package unpack order. /usr/lib/update-notifier/package-data-downloader -# Remove update-motd cpu-checker script -dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ - 0.110.1ubuntu1 -- "$@" - #DEBHELPER# diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.postrm update-notifier-3.192.30.2/debian/update-notifier-common.postrm --- update-notifier-3.192.30.1/debian/update-notifier-common.postrm 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ - 0.110.1ubuntu1 -- "$@" - -#DEBHELPER# diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.preinst update-notifier-3.192.30.2/debian/update-notifier-common.preinst --- update-notifier-3.192.30.1/debian/update-notifier-common.preinst 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.preinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -dpkg-maintscript-helper rm_conffile /etc/update-motd.d/20-cpu-checker \ - 0.110.1ubuntu1 -- "$@" - -#DEBHELPER# diff -Nru update-notifier-3.192.30.1/debian/update-notifier-common.triggers update-notifier-3.192.30.2/debian/update-notifier-common.triggers --- update-notifier-3.192.30.1/debian/update-notifier-common.triggers 2020-04-02 12:25:16.000000000 +0100 +++ update-notifier-3.192.30.2/debian/update-notifier-common.triggers 2020-11-06 15:56:19.000000000 +0000 @@ -1 +1 @@ -interest /usr/share/package-data-downloads +interest-noawait /usr/share/package-data-downloads