summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-06-21 14:28:05 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-06-21 14:29:40 +0900
commitf0934155c650c88b28f3a88e20ae232a03b3609c (patch)
treea8542d321b04b232cbc7e682213c5311912601c4
parenta4ad3a2944d43e179aff7e17e8467bc89337907e (diff)
downloadtde-packaging-f0934155c650c88b28f3a88e20ae232a03b3609c.tar.gz
tde-packaging-f0934155c650c88b28f3a88e20ae232a03b3609c.zip
DEB: fixed install location of kkbswitch.desktop file.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 6a4ea79e06172d878fa8bafdb64316e7fc3e8b7a)
-rw-r--r--debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install1
-rwxr-xr-xdebian/_base/applications/kkbswitch/debian/rules3
-rw-r--r--ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install1
-rwxr-xr-xubuntu/_base/applications/kkbswitch/debian/rules3
4 files changed, 0 insertions, 8 deletions
diff --git a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install b/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
index a6c12cb20..8be342631 100644
--- a/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
+++ b/debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
@@ -1,3 +1,2 @@
debian/tmp/opt/trinity
-debian/tmp/opt/trinity/share/applnk/Utilities/kkbswitch.desktop opt/trinity/share/applications
icons/kkbswitch.xpm opt/trinity/share/pixmaps
diff --git a/debian/_base/applications/kkbswitch/debian/rules b/debian/_base/applications/kkbswitch/debian/rules
index 5cc7cb39e..ed8854bab 100755
--- a/debian/_base/applications/kkbswitch/debian/rules
+++ b/debian/_base/applications/kkbswitch/debian/rules
@@ -20,9 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
binary-install/kkbswitch-trinity::
dh_testdir
- # is installed into /opt/trinity/share/applications directory
- rm debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/kkbswitch.desktop
- rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/
# is installed in xkb-data-extra-trinity package
rm debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/ru_ua
rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/
diff --git a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
index a6c12cb20..8be342631 100644
--- a/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
+++ b/ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install
@@ -1,3 +1,2 @@
debian/tmp/opt/trinity
-debian/tmp/opt/trinity/share/applnk/Utilities/kkbswitch.desktop opt/trinity/share/applications
icons/kkbswitch.xpm opt/trinity/share/pixmaps
diff --git a/ubuntu/_base/applications/kkbswitch/debian/rules b/ubuntu/_base/applications/kkbswitch/debian/rules
index 5cc7cb39e..ed8854bab 100755
--- a/ubuntu/_base/applications/kkbswitch/debian/rules
+++ b/ubuntu/_base/applications/kkbswitch/debian/rules
@@ -20,9 +20,6 @@ DEB_CMAKE_EXTRA_FLAGS := \
binary-install/kkbswitch-trinity::
dh_testdir
- # is installed into /opt/trinity/share/applications directory
- rm debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/kkbswitch.desktop
- rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/applnk/Utilities/
# is installed in xkb-data-extra-trinity package
rm debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/ru_ua
rmdir -p --ignore-fail-on-non-empty debian/$(cdbs_curpkg)/opt/trinity/share/X11/xkb/symbols/