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

This relates to Bug 1282

6 files changed, 6 insertions, 0 deletions

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
diff --git a/ubuntu/maverick/tdeartwork/debian/control b/ubuntu/maverick/tdeartwork/debian/control
index 19a88b4fa..09df752cf 100644
--- a/ubuntu/maverick/tdeartwork/debian/control
+++ b/ubuntu/maverick/tdeartwork/debian/control
@@ -73,6 +73,7 @@ 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
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be
diff --git a/ubuntu/precise/tdeartwork/debian/control b/ubuntu/precise/tdeartwork/debian/control
index 19a88b4fa..09df752cf 100644
--- a/ubuntu/precise/tdeartwork/debian/control
+++ b/ubuntu/precise/tdeartwork/debian/control
@@ -73,6 +73,7 @@ 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
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be
diff --git a/ubuntu/raring/tdeartwork/debian/control b/ubuntu/raring/tdeartwork/debian/control
index 19a88b4fa..09df752cf 100644
--- a/ubuntu/raring/tdeartwork/debian/control
+++ b/ubuntu/raring/tdeartwork/debian/control
@@ -73,6 +73,7 @@ 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
 Description: icon themes released with Trinity
  This package contains additional icon themes for Trinity. Icon themes can be