[neon/neon/ubuntu-advantage-tools/Neon/unstable] debian: add new empty package for ubuntu-advantage-desktop-daemon and clean up dpkg-divert commands

[Carlos De Maine]

Git commit dccfd6142cc42cabd6d59f7cb467f7a5e58b213f by Carlos De Maine.
Committed on 02/06/2026 at 00:22.
Pushed by carlosdem into branch 'Neon/unstable'.

add new empty package for ubuntu-advantage-desktop-daemon and clean up dpkg-divert commands

(cherry picked from commit ef5937d3203986f2f2f2df1fe12d4ea981e8c85f)

Co-authored-by: Carlos De Maine <carlosd.kde at gmail.com>

M  +17   -10   debian/control
M  +5    -3    debian/ubuntu-advantage-tools.postinst

https://invent.kde.org/neon/neon/ubuntu-advantage-tools/-/commit/dccfd6142cc42cabd6d59f7cb467f7a5e58b213f

diff --git a/debian/control b/debian/control
index f6bca4f..e6279d4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,41 +9,48 @@ Package: neon-ubuntu-advantage-tools
 Architecture: all
 Depends: ubuntu-advantage-tools, ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
 Package: ubuntu-advantage-tools
 Architecture: all
 Depends: ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
-Package: ubuntu-pro-client
+Package: ubuntu-advantage-desktop-daemon
 Architecture: all
 Depends: ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
-Package: ubuntu-pro-client-l10n
+Package: ubuntu-advantage-pro
 Architecture: all
 Depends: ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
-Package: ubuntu-advantage-pro
+Package: ubuntu-pro-auto-attach
 Architecture: all
 Depends: ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
-Package: ubuntu-pro-auto-attach
+Package: ubuntu-pro-client
+Architecture: all
+Depends: ${misc:Depends}
+Description: Dummy package
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
+ is an empty package to ensure they are not installed.
+
+Package: ubuntu-pro-client-l10n
 Architecture: all
 Depends: ${misc:Depends}
 Description: Dummy package
- Ubuntu Advantage Tools are not relevant to Neon systems so this
+ Ubuntu Advantage Tools are not relevant to KDE neon systems so this
  is an empty package to ensure they are not installed.
 
diff --git a/debian/ubuntu-advantage-tools.postinst b/debian/ubuntu-advantage-tools.postinst
index 021f5fe..fa48b2f 100644
--- a/debian/ubuntu-advantage-tools.postinst
+++ b/debian/ubuntu-advantage-tools.postinst
@@ -3,11 +3,13 @@
 set -e
 
 # mask the systemd services to not spam the terminal
-systemctl mask apt-news.service
-systemctl mask esm-cache.service​
+sudo systemctl stop ua-timer.timer ua-messaging.timer ua-messaging.service
+systemctl stop apt-news.service esm-cache.service
+systemctl mask apt-news.service esm-cache.service​
 
 # dpkg-divert the service away as well
-dpkg-divert --rename --divert /etc/apt/apt.conf.d/20apt-esm-hook.conf.disabled --add /etc/apt/apt.conf.d/20apt-esm-hook.conf
+dpkg-divert --rename --remove /etc/apt/apt.conf.d/20apt-esm-hook.conf
+dpkg-divert --rename --divert /etc/apt/apt.conf.d/20apt-esm-hook.confdisabled --add /etc/apt/apt.conf.d/20apt-esm-hook.conf
 #DEBHELPER#
 
 exit 0