From f5cecab60fe5193fa33bfcb4ed5ece55f197796d 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: [PATCH] Add kbabel and kicker-applets to Conflicts for tdeartwork on Debian and Ubuntu This relates to Bug 1282 (cherry picked from commit a07f60dccc6cae7db244a1ebb68a205e30889c82) --- debian/lenny/kdeartwork/debian/control | 3 ++- debian/squeeze/kdeartwork/debian/control | 3 ++- ubuntu/maverick/kdeartwork/debian/control | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/lenny/kdeartwork/debian/control b/debian/lenny/kdeartwork/debian/control index 19e941fbb..355552222 100644 --- a/debian/lenny/kdeartwork/debian/control +++ b/debian/lenny/kdeartwork/debian/control @@ -63,8 +63,9 @@ Description: widget styles released with Trinity Package: kdeartwork-theme-icon-trinity Architecture: all Section: kde -Recommends: kdesktop-trinity, kicker-trinity Replaces: kdelibs-data-trinity (<< 4:3.5) +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 used to customise the appearance of standard icons throughout KDE. They diff --git a/debian/squeeze/kdeartwork/debian/control b/debian/squeeze/kdeartwork/debian/control index 473d8a28a..e781da0b3 100644 --- a/debian/squeeze/kdeartwork/debian/control +++ b/debian/squeeze/kdeartwork/debian/control @@ -63,8 +63,9 @@ Description: widget styles released with Trinity Package: kdeartwork-theme-icon-trinity Architecture: all Section: kde -Recommends: kdesktop-trinity, kicker-trinity Replaces: kdelibs-data-trinity (<< 4:3.5) +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 used to customise the appearance of standard icons throughout KDE. They 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