From b2cc8a325c870a6ac28198916cea4ca6118471f5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 11 Sep 2016 18:32:06 +0900 Subject: Fixed khotkeys.desktop handling on Debian/Ubuntu. This resolve bug 2685. Signed-off-by: Michele Calgaro (cherry picked from commit 40d63ebf000e0e1d8782224dbf7dea17715c9c83) --- .../maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install | 1 - ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install | 1 - 2 files changed, 2 deletions(-) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install index 4521c6f2d..46d3b0650 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install @@ -532,7 +532,6 @@ debian/tmp/opt/trinity/share/icons/hicolor/48x48/apps/knetattach.png debian/tmp/opt/trinity/share/icons/hicolor/64x64/apps/knetattach.png debian/tmp/opt/trinity/share/icons/hicolor/128x128/apps/knetattach.png debian/tmp/opt/trinity/share/icons/hicolor/scalable/apps/knetattach.svgz -debian/tmp/opt/trinity/share/autostart/khotkeys.desktop debian/tmp/opt/trinity/share/icons/hicolor/16x16/apps/khotkeys.png debian/tmp/opt/trinity/share/icons/hicolor/32x32/apps/khotkeys.png debian/tmp/opt/trinity/share/templates/Directory.desktop diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index 16772027a..7a27b210a 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -96,5 +96,4 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png -debian/tmp/opt/trinity/share/services/kded/khotkeys.desktop debian/tmp/opt/trinity/share/services/kxkb.desktop -- cgit v1.2.1