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:58 +0100 |
| commit | f1534ff8f85b2e8ad6bc12c12620a184d492d6d6 (patch) | |
| tree | 2460e00906c81b3f5867f7e909ce9975974c0e21 /ubuntu/maverick/tdeaddons/debian | |
| parent | 1f54f40d28164b266adf3ee1edec537cc205af96 (diff) | |
| download | tde-packaging-f1534ff8f85b2e8ad6bc12c12620a184d492d6d6.tar.gz tde-packaging-f1534ff8f85b2e8ad6bc12c12620a184d492d6d6.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>
(cherry picked from commit 79f303990edc0267397bcf598fde51467b3ba27f)
Diffstat (limited to 'ubuntu/maverick/tdeaddons/debian')
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/control | 1 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/kicker-applets-trinity.install | 4 |
2 files changed, 3 insertions, 2 deletions
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 |