[neon/neon/masks/Neon/release] debian: move these packages to our own ubuntu-advantage-tools package, as ubuntu-minimal pulls them in they get installed early and an overriding package does not work

Jonathan Riddell null at kde.org
Mon Mar 18 21:45:44 GMT 2024


Git commit de72a8ebc0831eacc20fd31b40af00cb68a81677 by Jonathan Riddell.
Committed on 18/03/2024 at 21:44.
Pushed by jriddell into branch 'Neon/release'.

move these packages to our own ubuntu-advantage-tools package, as ubuntu-minimal pulls them in they get installed early and an overriding package does not work

M  +2    -2    debian/changelog
M  +0    -24   debian/control

https://invent.kde.org/neon/neon/masks/-/commit/de72a8ebc0831eacc20fd31b40af00cb68a81677

diff --git a/debian/changelog b/debian/changelog
index 0e76a0f..e506d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-neon-masks (0.0) UNRELEASED; urgency=medium
+neon-masks (32-0neon) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #XXXXXX)
 
- -- Harald Sitter <sitter at kde.org>  Thu, 03 May 2018 16:10:05 +0200
+ -- Jonathan Riddell <jr at jriddell.org>  Mon, 18 Mar 2024 21:25:38 +0000
diff --git a/debian/control b/debian/control
index acb0f2c..b1ac8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -23,30 +23,6 @@ Description: Adwaita icon theme override
  adwaita-icon-theme-full. This package will be automatically removed when
  adwaita is installed.
 
-Package: neon-ubuntu-advantage-tools
-Architecture: all
-Depends: neon-ubuntu-pro-client, ${misc:Depends}
-Provides: ubuntu-advantage-tools
-Breaks: ubuntu-advantage-tools
-Replaces: ubuntu-advantage-tools
-Description: Ubuntu Advantage Tools override
- This package overrides the ubuntu advantage tools as they aren't applicable
- to KDE neon. Should you wish to use them anyway, you can simply install
- ubuntu-advantage-tools manually. This override will be automatically removed
- as part of the installation of ubuntu-advantage-tools.
-
-Package: neon-ubuntu-pro-client
-Architecture: all
-Depends: ${misc:Depends}
-Provides: ubuntu-pro-client
-Breaks: ubuntu-pro-client
-Replaces: ubuntu-pro-client
-Description: Ubuntu Pro Client override
- This package overrides the ubuntu pro client as they aren't applicable
- to KDE neon. Should you wish to use them anyway, you can simply install
- ubuntu-pro-client manually. This override will be automatically removed
- as part of the installation of ubuntu-pro-client.
-
 Package: neon-apport
 Architecture: all
 Depends: ${misc:Depends}



More information about the Neon-commits mailing list