diff --git a/Makefile b/Makefile index d7ab5d9..791189a 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ VERSION := $(shell cat version) DIST ?= fc18 KDESERVICEDIR ?= /usr/share/kde4/services +KDE5SERVICEDIR ?= /usr/share/kservices5/ServiceMenus/ SBINDIR ?= /usr/sbin BINDIR ?= /usr/bin LIBDIR ?= /usr/lib @@ -249,6 +250,8 @@ install-common: install-doc install -m 0644 misc/qubes-suspend-module-blacklist $(DESTDIR)/etc/qubes-suspend-module-blacklist install -d $(DESTDIR)/$(KDESERVICEDIR) install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDESERVICEDIR) + install -d $(DESTDIR)/$(KDE5SERVICEDIR) + install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDE5SERVICEDIR) install -d $(DESTDIR)/etc/qubes-rpc install -m 0755 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell} $(DESTDIR)/etc/qubes-rpc install -m 0755 qubes-rpc/qubes.VMRootShell $(DESTDIR)/etc/qubes-rpc diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install index 8b0d709..795b8a8 100644 --- a/debian/qubes-core-agent.install +++ b/debian/qubes-core-agent.install @@ -138,6 +138,7 @@ usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf usr/share/glib-2.0/schemas/* usr/share/kde4/services/*.desktop +usr/share/kservices5/ServiceMenus/*.desktop usr/share/man/man1/qvm-* usr/share/qubes/mime-override/globs usr/share/qubes/qubes-master-key.asc diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec index 3ec9e73..49eaa36 100644 --- a/rpm_spec/core-agent.spec +++ b/rpm_spec/core-agent.spec @@ -279,6 +279,7 @@ Thunar support for Qubes VM tools %define _builddir %(pwd) %define kde_service_dir /usr/share/kde4/services +%define kde5_service_dir /usr/share/kservices5/ServiceMenus %prep # we operate on the current directory, so no need to unpack anything @@ -550,6 +551,9 @@ rm -f %{name}-%{version} %{kde_service_dir}/qvm-copy.desktop %{kde_service_dir}/qvm-move.desktop %{kde_service_dir}/qvm-dvm.desktop +%{kde5_service_dir}/qvm-copy.desktop +%{kde5_service_dir}/qvm-move.desktop +%{kde5_service_dir}/qvm-dvm.desktop %config(noreplace) /etc/X11/xorg-preload-apps.conf /etc/fstab /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*