summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-04-28 16:56:25 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-04-28 17:20:29 +0200
commitf5cecab60fe5193fa33bfcb4ed5ece55f197796d (patch)
tree6b5e7a575f2403ac4f6cdd10dff630d147eacaab /ubuntu
parent98e89a63eeaa9f9a8cc9ec66828cb2862a3f3068 (diff)
downloadtde-packaging-f5cecab60fe5193fa33bfcb4ed5ece55f197796d.tar.gz
tde-packaging-f5cecab60fe5193fa33bfcb4ed5ece55f197796d.zip
Add kbabel and kicker-applets to Conflicts for tdeartwork on Debian and Ubuntu
This relates to Bug 1282 (cherry picked from commit a07f60dccc6cae7db244a1ebb68a205e30889c82)
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/kdeartwork/debian/control1
1 files changed, 1 insertions, 0 deletions
diff --git a/ubuntu/maverick/kdeartwork/debian/control b/ubuntu/maverick/kdeartwork/debian/control
index 840079672..3a05d8a8c 100644
--- a/ubuntu/maverick/kdeartwork/debian/control
+++ b/ubuntu/maverick/kdeartwork/debian/control
@@ -73,6 +73,7 @@ Architecture: all
Section: kde
Replaces: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
Breaks: kdeartwork-theme-icon-kde3 (<< 4:3.5.13)
+Conflicts: kbabel-trinity (<< 4:3.5.13.2~), kicker-applets-trinity (<< 4:3.5.13.2~)
Recommends: kdesktop-trinity, kicker-trinity
Description: icon themes released with Trinity
This package contains additional icon themes for Trinity. Icon themes can be