diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2017-03-08 09:09:19 +0100 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2017-03-08 09:09:19 +0100 |
commit | 79f303990edc0267397bcf598fde51467b3ba27f (patch) | |
tree | 705723f88e48879a5090dd9d23974c57e9d1775c /debian/squeeze/tdeaddons | |
parent | 7b599145e99fdb4ce9d7dc1f9dd9a0bb02d27ae6 (diff) | |
download | tde-packaging-79f303990edc0267397bcf598fde51467b3ba27f.tar.gz tde-packaging-79f303990edc0267397bcf598fde51467b3ba27f.zip |
DEB tdeaddons: Allow the installation of ktimemon locolor icons
This relates to bug 1282
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'debian/squeeze/tdeaddons')
-rw-r--r-- | debian/squeeze/tdeaddons/debian/control | 1 | ||||
-rw-r--r-- | debian/squeeze/tdeaddons/debian/kicker-applets-trinity.install | 4 |
2 files changed, 3 insertions, 2 deletions
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 |