summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-03-08 16:23:50 +0100
committerSlávek Banko <slavek.banko@axis.cz>2017-03-08 16:24:05 +0100
commitb8274a9c0d006e64a230e0733ed38dccd8280d61 (patch)
treeaefb41a9258055a79ea1374a02f7aac1d6635417 /ubuntu/maverick
parentf1534ff8f85b2e8ad6bc12c12620a184d492d6d6 (diff)
downloadtde-packaging-b8274a9c0d006e64a230e0733ed38dccd8280d61.tar.gz
tde-packaging-b8274a9c0d006e64a230e0733ed38dccd8280d61.zip
DEB tdesdk: Allow the installation of kbabel locolor icons
This relates to bug 1282 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit d3c95593ce24db8fabe2c5e5d12f7adc8ea2766c)
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/tdesdk/debian/control1
-rw-r--r--ubuntu/maverick/tdesdk/debian/kbabel-trinity.install4
2 files changed, 3 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdesdk/debian/control b/ubuntu/maverick/tdesdk/debian/control
index 97dc3e462..5e8301d98 100644
--- a/ubuntu/maverick/tdesdk/debian/control
+++ b/ubuntu/maverick/tdesdk/debian/control
@@ -90,6 +90,7 @@ Breaks: kbabel-kde3 (<< 4:14.0.0~), kbabel-trinity (<< 4:14.0.0~)
Depends: ${shlibs:Depends}
Recommends: gettext
Suggests: khelpcenter-trinity, tdesdk-trinity-doc-html
+Conflicts: tdeartwork-theme-icon-trinity (<< 4:14.0.5~)
Description: PO-file editing suite for Trinity
This is a suite of programs for editing gettext message files (PO-files).
It is designed to help you translate fast and consistently.
diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
index 72d23b29d..0765b223f 100644
--- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity.install
+++ b/ubuntu/maverick/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/tdefile_po.desktop