summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-06-22 23:23:43 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-06-22 23:24:02 +0200
commit8f36ed71b8d5896a343f83f12a6fe3b1cd073d16 (patch)
treee4a4cfbd75d4655c9ec97ae1e848590a18605d28 /ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian
parent043fbbf43aae32d8763b8e584ec5c32ea78cbd1c (diff)
downloadtde-packaging-8f36ed71b8d5896a343f83f12a6fe3b1cd073d16.tar.gz
tde-packaging-8f36ed71b8d5896a343f83f12a6fe3b1cd073d16.zip
Add conflicts kubuntu-settings-desktop for default settings packages on Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 54337e78cd7c84fab08c2e3f4bf69394a0d381b8)
Diffstat (limited to 'ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian')
-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