DEB tdeartwork: Remove kbabel and kicker-applets from Conflicts

This relates to bug 1282 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 7b599145e9)
8 years ago · 1f54f40d28
parent 6a4d740eea
commit 1f54f40d28
3 changed files with 0 additions and 3 deletions
--- 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
--- 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
--- 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