From 79f303990edc0267397bcf598fde51467b3ba27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 8 Mar 2017 09:09:19 +0100 Subject: DEB tdeaddons: Allow the installation of ktimemon locolor icons This relates to bug 1282 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdeaddons/debian/control | 1 + debian/lenny/tdeaddons/debian/kicker-applets-trinity.install | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/lenny/tdeaddons') 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 -- cgit v1.2.1