summaryrefslogtreecommitdiffstats
path: root/debian/_base/metapackages/redmond-default-settings
diff options
context:
space:
mode:
Diffstat (limited to 'debian/_base/metapackages/redmond-default-settings')
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/control2
-rw-r--r--debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm3
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index e89dcad2f..363962817 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -206,6 +206,6 @@ Suggests: adept-trinity,
tde-guidance-trinity,
apport-gtk,
hplip-gui
-Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
+Conflicts: desktop-base, desktop-base-trinity, kubuntu-default-settings-trinity, kubuntu-default-settings, kubuntu-settings-desktop
Description: Redmond default settings and artwork for the Kubuntu Trinity desktop
This package includes artwork and Kubuntu branding.
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
index 2cbdac854..adada03a7 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
+++ b/debian/_base/metapackages/redmond-default-settings/debian/redmond-default-settings-trinity.postrm
@@ -28,6 +28,9 @@ case "$1" in
upgrade)
;;
+ abort-install)
+ ;;
+
*)
echo "Unknown argument ($1) for $0"
;;