DEB tdesdk: Allow the installation of kbabel locolor icons

This relates to bug 1282

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

4 files changed, 6 insertions, 4 deletions

diff --git a/debian/lenny/tdesdk/debian/control b/debian/lenny/tdesdk/debian/control
index e4615594c..af20ea0ac 100644
--- a/debian/lenny/tdesdk/debian/control
+++ b/debian/lenny/tdesdk/debian/control
@@ -90,6 +90,7 @@ Breaks: kbabel-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Recommends: gettext
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.install b/debian/lenny/tdesdk/debian/kbabel-trinity.install
index 72d23b29d..0765b223f 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity.install
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity.install
@@ -82,10 +82,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/catalogmanager.png
-#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
-#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
 debian/tmp/opt/trinity/share/services/tdefile_po.desktop
diff --git a/debian/squeeze/tdesdk/debian/control b/debian/squeeze/tdesdk/debian/control
index e4615594c..af20ea0ac 100644
--- a/debian/squeeze/tdesdk/debian/control
+++ b/debian/squeeze/tdesdk/debian/control
@@ -90,6 +90,7 @@ Breaks: kbabel-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}
 Recommends: gettext
 Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 Description: PO-file editing suite for Trinity
  This is a suite of programs for editing gettext message files (PO-files).
  It is designed to help you translate fast and consistently.
diff --git a/debian/squeeze/tdesdk/debian/kbabel-trinity.install b/debian/squeeze/tdesdk/debian/kbabel-trinity.install
index 72d23b29d..0765b223f 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity.install
+++ b/debian/squeeze/tdesdk/debian/kbabel-trinity.install
@@ -82,10 +82,10 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/catalogmanager.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/catalogmanager.png
-#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/catalogmanager.png
-#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabel.png
 debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/kbabeldict.png
 debian/tmp/opt/trinity/share/services/dbsearchengine.desktop
 debian/tmp/opt/trinity/share/services/tdefile_po.desktop