summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2016-09-11 18:32:06 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2016-09-11 18:34:40 +0900
commitb2cc8a325c870a6ac28198916cea4ca6118471f5 (patch)
tree73b0ef1e632ca1c98d5000206275c8f4b3156044
parent7b1ee62aba118c98882ff2c16ea4bf9f653ceb96 (diff)
downloadtde-packaging-b2cc8a325c870a6ac28198916cea4ca6118471f5.tar.gz
tde-packaging-b2cc8a325c870a6ac28198916cea4ca6118471f5.zip
Fixed khotkeys.desktop handling on Debian/Ubuntu. This resolve bug 2685.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 40d63ebf000e0e1d8782224dbf7dea17715c9c83)
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install1
-rw-r--r--debian/squeeze/tdebase/debian/tdebase-trinity-bin.install1
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-runtime-data-common-trinity.install1
-rw-r--r--ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install1
4 files changed, 0 insertions, 4 deletions
diff --git a/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install b/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install
index 4521c6f2d..46d3b0650 100644
--- a/debian/squeeze/tdebase/debian/tdebase-runtime-data-common-trinity.install
+++ b/debian/squeeze/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/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install b/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
index 16772027a..7a27b210a 100644
--- a/debian/squeeze/tdebase/debian/tdebase-trinity-bin.install
+++ b/debian/squeeze/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
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