From a07f60dccc6cae7db244a1ebb68a205e30889c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 28 Apr 2013 16:56:25 +0200 Subject: Add kbabel and kicker-applets to Conflicts for tdeartwork on Debian and Ubuntu This relates to Bug 1282 --- debian/lenny/tdeartwork/debian/control | 1 + debian/squeeze/tdeartwork/debian/control | 1 + debian/wheezy/tdeartwork/debian/control | 1 + 3 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index d01eac73b..56a6ec0d3 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -73,6 +73,7 @@ Architecture: all Section: tde Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0) Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0) +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 diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index d01eac73b..56a6ec0d3 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -73,6 +73,7 @@ Architecture: all Section: tde Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0) Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0) +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 diff --git a/debian/wheezy/tdeartwork/debian/control b/debian/wheezy/tdeartwork/debian/control index d01eac73b..56a6ec0d3 100644 --- a/debian/wheezy/tdeartwork/debian/control +++ b/debian/wheezy/tdeartwork/debian/control @@ -73,6 +73,7 @@ Architecture: all Section: tde Replaces: kdeartwork-theme-icon-trinity (<< 4:14.0.0) Breaks: kdeartwork-theme-icon-trinity (<< 4:14.0.0) +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 -- cgit v1.2.1