From 8a933a76ec3d0f9bedf0f103e18e1299d4498b75 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 12 Jul 2011 19:46:00 +0200 Subject: [PATCH] dom0: Fix appmenu-select desktop file name (#266) --- dom0/aux-tools/create_apps_for_appvm.sh | 2 +- ...s-appmenu-select.template => qubes-appmenu-select.desktop} | 0 rpm_spec/core-dom0.spec | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename dom0/misc/{qubes-appmenu-select.template => qubes-appmenu-select.desktop} (100%) diff --git a/dom0/aux-tools/create_apps_for_appvm.sh b/dom0/aux-tools/create_apps_for_appvm.sh index eb5410ba..f5659f6b 100755 --- a/dom0/aux-tools/create_apps_for_appvm.sh +++ b/dom0/aux-tools/create_apps_for_appvm.sh @@ -42,7 +42,7 @@ if [ "$SRCDIR" != "none" ]; then else find $SRCDIR -name "*.desktop" $CHECK_WHITELISTED -exec /usr/lib/qubes/convert_apptemplate2vm.sh {} $APPSDIR $VMNAME $VMDIR \; fi - /usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.template $APPSDIR $VMNAME $VMDIR + /usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.desktop $APPSDIR $VMNAME $VMDIR if [ "$VMTYPE" = "vm-templates" ]; then /usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-templatevm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR diff --git a/dom0/misc/qubes-appmenu-select.template b/dom0/misc/qubes-appmenu-select.desktop similarity index 100% rename from dom0/misc/qubes-appmenu-select.template rename to dom0/misc/qubes-appmenu-select.desktop diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec index 3d693856..d93c3cba 100644 --- a/rpm_spec/core-dom0.spec +++ b/rpm_spec/core-dom0.spec @@ -137,7 +137,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons cp icons/*.png $RPM_BUILD_ROOT/usr/share/qubes/icons cp misc/qubes-vm.directory.template $RPM_BUILD_ROOT/usr/share/qubes/ cp misc/qubes-templatevm.directory.template $RPM_BUILD_ROOT/usr/share/qubes/ -cp misc/qubes-appmenu-select.template $RPM_BUILD_ROOT/usr/share/qubes/ +cp misc/qubes-appmenu-select.desktop $RPM_BUILD_ROOT/usr/share/qubes/ cp misc/vm-template.conf $RPM_BUILD_ROOT/usr/share/qubes/ mkdir -p $RPM_BUILD_ROOT/usr/bin @@ -314,7 +314,7 @@ fi %dir /usr/share/qubes/icons/*.png /usr/share/qubes/qubes-vm.directory.template /usr/share/qubes/qubes-templatevm.directory.template -/usr/share/qubes/qubes-appmenu-select.template +/usr/share/qubes/qubes-appmenu-select.desktop /usr/share/qubes/vm-template.conf /usr/lib/qubes/qubes_setup_dnat_to_ns /usr/lib/qubes/qubes_fix_nm_conf.sh