summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/defaultsettings/kubuntu-default-settings
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/defaultsettings/kubuntu-default-settings')
-rw-r--r--ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control2
1 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control
index 2d3fd59d9..257e75ae3 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/control
+++ b/ubuntu/maverick/defaultsettings/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
+Conflicts: 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