From d3c95593ce24db8fabe2c5e5d12f7adc8ea2766c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 8 Mar 2017 16:23:50 +0100 Subject: DEB tdesdk: Allow the installation of kbabel locolor icons This relates to bug 1282 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ubuntu/maverick/tdesdk/debian/control | 1 + ubuntu/maverick/tdesdk/debian/kbabel-trinity.install | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/tdesdk') 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 -- cgit v1.2.3