From 5146fe6481b7b94faff52f2af864aeafd155f70f Mon Sep 17 00:00:00 2001 From: Jason Mehring Date: Fri, 27 Feb 2015 16:17:44 -0500 Subject: [PATCH] Removed code that deleted original nautilus actions dpkg/rpm should handle this automatically on upgrading package (cherry picked from commit da2b0cde16fbe33b3ad1df26537db337414dc8d3) --- debian/qubes-core-agent.postinst | 5 ----- rpm_spec/core-vm.spec | 5 ----- 2 files changed, 10 deletions(-) diff --git a/debian/qubes-core-agent.postinst b/debian/qubes-core-agent.postinst index 1ca8cff..e82be24 100755 --- a/debian/qubes-core-agent.postinst +++ b/debian/qubes-core-agent.postinst @@ -302,11 +302,6 @@ case "${1}" in # XXX: TODO: Needs to be implemented still # These do not exist on debian; maybe a different package name # ntpd.service \ - - # Remove Nautilus actions as they have been replaced with nautilus-python - rm -f /usr/share/file-manager/actions/qvm-copy-gnome.desktop - rm -f /usr/share/file-manager/actions/qvm-move-gnome.desktop - rm -f /usr/share/file-manager/actions/qvm-dvm-gnome.desktop ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index a0b5226..a67065a 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -258,11 +258,6 @@ if [ ! -f '/etc/sysconfig/ip6tables' ]; then cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables fi -# Remove Nautilus actions as they have been replaced with nautilus-python -rm -f /usr/share/file-manager/actions/qvm-copy-gnome.desktop -rm -f /usr/share/file-manager/actions/qvm-move-gnome.desktop -rm -f /usr/share/file-manager/actions/qvm-dvm-gnome.desktop - if [ "$1" != 1 ] ; then # do the rest of %post thing only when updating for the first time... exit 0