Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

This commit is contained in:
Joanna Rutkowska 2012-06-22 15:17:45 +02:00
commit b3ef32d36e
2 changed files with 2 additions and 1 deletions

View File

@ -42,6 +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.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

View File

@ -1,7 +1,7 @@
[Desktop Entry]
Version=1.0
Type=Application
Exec=qubes-appmenu-select %VMNAME%
Exec=qubes-vm-settings %VMNAME% applications
Icon=/usr/share/qubes/icons/qubes.png
Terminal=false
Name=%VMNAME%: Add more shortcuts...