From 6a4ea79e06172d878fa8bafdb64316e7fc3e8b7a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 21 Jun 2020 14:28:05 +0900 Subject: DEB: fixed install location of kkbswitch.desktop file. Signed-off-by: Michele Calgaro --- debian/_base/applications/kkbswitch/debian/kkbswitch-trinity.install | 1 - debian/_base/applications/kkbswitch/debian/rules | 3 --- ubuntu/_base/applications/kkbswitch/debian/kkbswitch-trinity.install | 1 - ubuntu/_base/applications/kkbswitch/debian/rules | 3 --- 4 files changed, 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/ -- cgit v1.2.3