summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-10-24 20:08:02 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-10-24 20:13:21 +0200
commit7e4bc835fa28afa285c54da29315f1da0842acad (patch)
tree3bafbbfe1d6b9ccbc02ab869e9a3fdd2011678e6 /ubuntu
parent0b2fd0596ed4542e97cde159ebf0a6335c18e1b5 (diff)
downloadtde-packaging-7e4bc835fa28afa285c54da29315f1da0842acad.tar.gz
tde-packaging-7e4bc835fa28afa285c54da29315f1da0842acad.zip
DEB metapackages: Add desktop-base to Conflicts for other desktop configurations.
Add basic processing for abort-install to postrm scripts. This resolves issue TDE/tde#67. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/control2
-rw-r--r--ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm3
2 files changed, 4 insertions, 1 deletions
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
index bae0ab8af..a67cc83c9 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
Package: kubuntu-default-settings-trinity
Architecture: all
Depends: crystalcursors
-Conflicts: kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings, kubuntu-settings-desktop
Recommends: tdmtheme-trinity, kubuntu-tdm-themes
Description: Default settings and artwork for the Ubuntu Trinity desktop
This package contains the default settings used by Ubuntu [Trinity]. It also
diff --git a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
index 3727a65c1..22d39ff4b 100644
--- a/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
+++ b/ubuntu/_base/metapackages/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postrm
@@ -32,6 +32,9 @@ case "$1" in
upgrade)
;;
+ abort-install)
+ ;;
+
*)
echo "Unknown argument ($1) for $0"
;;