summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-10-23 01:59:21 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-10-23 01:59:21 +0200
commitdd1b9be2bb5a07477f83925f5b568f696fc4ad23 (patch)
tree0259518943d81070a34152f6fdccfe89c30e7c94 /ubuntu/precise
parente7f51ead5a067b6e3ac4fc64edc734a82711f2d2 (diff)
downloadtde-packaging-dd1b9be2bb5a07477f83925f5b568f696fc4ad23.tar.gz
tde-packaging-dd1b9be2bb5a07477f83925f5b568f696fc4ad23.zip
Fix locolor icons conflict with tdeartwork on Debian and Ubuntu
Diffstat (limited to 'ubuntu/precise')
-rw-r--r--ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install4
-rw-r--r--ubuntu/precise/tdesdk/debian/kbabel-trinity.install4
2 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install b/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install
index 2ab92dddd..3ffd7717e 100644
--- a/ubuntu/precise/tdeaddons/debian/kicker-applets-trinity.install
+++ b/ubuntu/precise/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/precise/tdesdk/debian/kbabel-trinity.install b/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
index 09e1b6dd7..4bafa51f0 100644
--- a/ubuntu/precise/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/precise/tdesdk/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