From 1f54f40d28164b266adf3ee1edec537cc205af96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 8 Mar 2017 02:59:20 +0100 Subject: DEB tdeartwork: Remove kbabel and kicker-applets from Conflicts This relates to bug 1282 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 7b599145e99fdb4ce9d7dc1f9dd9a0bb02d27ae6) --- debian/lenny/tdeartwork/debian/control | 1 - debian/squeeze/tdeartwork/debian/control | 1 - ubuntu/maverick/tdeartwork/debian/control | 1 - 3 files changed, 3 deletions(-) diff --git a/debian/lenny/tdeartwork/debian/control b/debian/lenny/tdeartwork/debian/control index 250c52093..9cc49c26e 100644 --- a/debian/lenny/tdeartwork/debian/control +++ b/debian/lenny/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/debian/squeeze/tdeartwork/debian/control b/debian/squeeze/tdeartwork/debian/control index 250c52093..9cc49c26e 100644 --- a/debian/squeeze/tdeartwork/debian/control +++ b/debian/squeeze/tdeartwork/debian/control @@ -75,7 +75,6 @@ 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 Depends: ${misc:Depends} Description: icon themes released with Trinity diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control index 577973f4e..94fb2216e 100644 --- a/ubuntu/maverick/tdeartwork/debian/control +++ b/ubuntu/maverick/tdeartwork/debian/control @@ -75,7 +75,6 @@ Architecture: all Section: tde Replaces: kdeartwork-theme-icon-kde3 (<< 4:14.0.0~), kdeartwork-theme-icon-trinity (<< 4:14.0.0~) Breaks: kdeartwork-theme-icon-kde3 (<< 4:14.0.0~), 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 Depends: ${misc:Depends} Description: icon themes released with Trinity -- cgit v1.2.1