summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/metapackages
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:32 +0200
commitae6fdea3336ec22bd7e81d249c1823b02f15dddf (patch)
tree28f2f591412334c79a614dee06545debf20f0576 /ubuntu/_base/metapackages
parent7e60a86b49820eefbedee7c578fee26704563143 (diff)
downloadtde-packaging-ae6fdea3336ec22bd7e81d249c1823b02f15dddf.tar.gz
tde-packaging-ae6fdea3336ec22bd7e81d249c1823b02f15dddf.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> (cherry picked from commit 7e4bc835fa28afa285c54da29315f1da0842acad)
Diffstat (limited to 'ubuntu/_base/metapackages')
-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"
;;