Let guest additions stuff remain in one package.

diff --git a/debian/.gitignore b/debian/.gitignore
index a950848b0867625654fb8572b02d32e6fc4b2913..2ffbef44694ef7ff7e46d2ecc383f498c90a9881 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -3,6 +3,6 @@
 /neurodebian-desktop
 /neurodebian-dev
 /neurodebian-guest-additions
-/neurodebian-trailer
+/neurodebian-keyring
 /*.log
 /*.substvars

diff --git a/debian/neurodebian-desktop.install b/debian/neurodebian-desktop.install
index e4430ee833533c93be8947c69eb4c59adfebd9da..eb9daa06cb39a6de796f3ec8441e0c770995cb50 100644 (file)
--- a/debian/neurodebian-desktop.install
+++ b/debian/neurodebian-desktop.install
@@ -2,5 +2,5 @@ build/wallpaper/neurodebian.png usr/share/backgrounds
 build/icons/* usr/share/pixmaps
 xdg/neurodebian.menu etc/xdg/menus/applications-merged
 xdg/directories/* usr/share/desktop-directories
-xdg/desktop/* usr/share/applications
+xdg/desktop/neurodebian-* usr/share/applications
 tools/nd-autoinstall usr/bin

diff --git a/debian/neurodebian-guest-additions.install b/debian/neurodebian-guest-additions.install
index ec6c292c9da5e3a3180948823b70808633be961e..e330508062eefe4505ae4092ed42e93adc119fe8 100644 (file)
--- a/debian/neurodebian-guest-additions.install
+++ b/debian/neurodebian-guest-additions.install
@@ -2,3 +2,4 @@ etc/sudoers.d/nopasswd etc/sudoers.d/
 etc/xdg/autostart/* etc/xdg/autostart/
 etc/gconf/* usr/share/gconf/defaults/
 tools/nd-vmsetupwizard usr/bin
+xdg/desktop/neurodebianguest-* usr/share/applications

diff --git a/xdg/desktop/neurodebian-vmsetupwizard.desktop b/xdg/desktop/neurodebian-vmsetupwizard.desktop
deleted file mode 100644 (file)
index 5e98ab8..0000000
--- a/xdg/desktop/neurodebian-vmsetupwizard.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VirtualMachine Setup Wizard
-Exec=nd-vmsetupwizard
-Type=Application
-Terminal=false
-Icon=system-run
-Categories=X-NeuroDebian

diff --git a/xdg/desktop/neurodebianguest-vmsetupwizard.desktop b/xdg/desktop/neurodebianguest-vmsetupwizard.desktop
new file mode 100644 (file)
index 0000000..5e98ab8
--- /dev/null
+++ b/xdg/desktop/neurodebianguest-vmsetupwizard.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VirtualMachine Setup Wizard
+Exec=nd-vmsetupwizard
+Type=Application
+Terminal=false
+Icon=system-run
+Categories=X-NeuroDebian