diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-23 01:59:21 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-23 02:03:31 +0200 |
| commit | 18c68e546b6f217f2330df5f87891de2ab0adb26 (patch) | |
| tree | cfeffb2a83ecd378a9fd06088dce81371cab0abd /ubuntu | |
| parent | c4b7cdc370af1c12781527f7a51b7e2c10ff5f49 (diff) | |
| download | tde-packaging-18c68e546b6f217f2330df5f87891de2ab0adb26.tar.gz tde-packaging-18c68e546b6f217f2330df5f87891de2ab0adb26.zip | |
Fix locolor icons conflict with tdeartwork on Debian and Ubuntu
(cherry picked from commit dd1b9be2bb5a07477f83925f5b568f696fc4ad23)
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install | 4 | ||||
| -rw-r--r-- | ubuntu/maverick/kdesdk/debian/kbabel-trinity.install | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install b/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install index 2ab92dddd..3ffd7717e 100644 --- a/ubuntu/maverick/kdeaddons/debian/kicker-applets-trinity.install +++ b/ubuntu/maverick/kdeaddons/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/kdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install index 89437643b..2d6dede0c 100644 --- a/ubuntu/maverick/kdesdk/debian/kbabel-trinity.install +++ b/ubuntu/maverick/kdesdk/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/kfile_po.desktop |