Add kbabel and kicker-applets to Conflicts for tdeartwork on Debian and Ubuntu

This relates to Bug 1282
(cherry picked from commit a07f60dccc)

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

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

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