DEB tdeaddons: Allow the installation of ktimemon locolor icons

This relates to bug 1282

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 79f303990edc0267397bcf598fde51467b3ba27f)

6 files changed, 9 insertions, 6 deletions

diff --git a/debian/lenny/tdeaddons/debian/control b/debian/lenny/tdeaddons/debian/control
index d0e64d479..7c2444472 100644
--- a/debian/lenny/tdeaddons/debian/control
+++ b/debian/lenny/tdeaddons/debian/control
@@ -130,6 +130,7 @@ Replaces: kicker-applets-trinity (<< 4:14.0.0~)
 Breaks: kicker-applets-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
diff --git a/debian/lenny/tdeaddons/debian/kicker-applets-trinity.install b/debian/lenny/tdeaddons/debian/kicker-applets-trinity.install
index 3ffd7717e..2ab92dddd 100644
--- a/debian/lenny/tdeaddons/debian/kicker-applets-trinity.install
+++ b/debian/lenny/tdeaddons/debian/kicker-applets-trinity.install
@@ -14,8 +14,8 @@ debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.docbook
-#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
-#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ktimemon.png
 kicker-applets/kolourpicker/TODO /opt/trinity/share/doc/kicker-applets/kolourpicker
diff --git a/debian/squeeze/tdeaddons/debian/control b/debian/squeeze/tdeaddons/debian/control
index d0e64d479..7c2444472 100644
--- a/debian/squeeze/tdeaddons/debian/control
+++ b/debian/squeeze/tdeaddons/debian/control
@@ -130,6 +130,7 @@ Replaces: kicker-applets-trinity (<< 4:14.0.0~)
 Breaks: kicker-applets-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
diff --git a/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.install b/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.install
index 3ffd7717e..2ab92dddd 100644
--- a/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.install
+++ b/debian/squeeze/tdeaddons/debian/kicker-applets-trinity.install
@@ -14,8 +14,8 @@ debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.docbook
-#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
-#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ktimemon.png
 kicker-applets/kolourpicker/TODO /opt/trinity/share/doc/kicker-applets/kolourpicker
diff --git a/ubuntu/maverick/tdeaddons/debian/control b/ubuntu/maverick/tdeaddons/debian/control
index a8d7295e7..62085d825 100644
--- a/ubuntu/maverick/tdeaddons/debian/control
+++ b/ubuntu/maverick/tdeaddons/debian/control
@@ -130,6 +130,7 @@ Replaces: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.
 Breaks: kicker-applets-kde3 (<< 4:14.0.0~), kicker-applets-trinity (<< 4:14.0.0~)
 Depends: ${shlibs:Depends}, kicker-trinity
 Suggests: xmms-kde-trinity, khelpcenter-trinity, tdeaddons-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
 Provides: ktimemon-trinity
 Enhances: kicker-trinity
 Description: applets for Kicker, the Trinity panel
diff --git a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
index 3ffd7717e..2ab92dddd 100644
--- a/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install
@@ -14,8 +14,8 @@ debian/tmp/opt/trinity/share/config.kcfg/kbinaryclock.kcfg
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/common
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/index.cache.bz2
 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kicker-applets/*.docbook
-#debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
-#debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/16x16/apps/ktimemon.png
+debian/tmp/opt/trinity/share/icons/locolor/32x32/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/ktimemon.png
 debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/ktimemon.png
 kicker-applets/kolourpicker/TODO /opt/trinity/share/doc/kicker-applets/kolourpicker