Adding debian version 7.0.6-dfsg-1.debian/7.0.6-dfsg-1debian

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 77 insertions, 0 deletions

diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
new file mode 100644
index 00000000..ce24d1fe
--- /dev/null
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -0,0 +1,77 @@
+Description: Change error messages for vboxdrv failure, according to virtualbox-dkms.
+Author: Daniel Hahler <ubuntu@thequod.de>
+
+Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp
++++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp
+@@ -276,12 +276,8 @@
+ 
+ #ifdef RT_OS_LINUX
+                 case VERR_SUPDRV_COMPONENT_NOT_FOUND:
+-                    pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
+-                                  "that VirtualBox is correctly installed, and if you are using EFI "
+-                                  "Secure Boot that the modules are signed if necessary in the right "
+-                                  "way for your host system.  Then try to recompile and reload the "
+-                                  "kernel modules by executing "
+-                                  "'/sbin/vboxconfig' as root");
++                    pszError = N_("Please install the virtualbox-dkms package "
++                                  "and execute 'modprobe vboxdrv' as root");
+                     break;
+ #endif
+ 
+@@ -347,12 +343,8 @@
+             {
+                 case VERR_VM_DRIVER_LOAD_ERROR:
+ #ifdef RT_OS_LINUX
+-                    pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
+-                                  "was either not loaded, /dev/vboxdrv is not set up properly, "
+-                                  "or you are using EFI Secure Boot and the module is not signed "
+-                                  "in the right way for your system.  If necessary, try setting up "
+-                                  "the kernel module again by executing "
+-                                  "'/sbin/vboxconfig' as root");
++                    pszError = N_("Please install the virtualbox-dkms package "
++                                  "and execute 'modprobe vboxdrv' as root");
+ #else
+                     pszError = N_("VirtualBox kernel driver not loaded");
+ #endif
+@@ -391,12 +383,8 @@
+                 case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
+                 case VERR_VM_DRIVER_NOT_INSTALLED:
+ #ifdef RT_OS_LINUX
+-                    pszError = N_("VirtualBox kernel driver not Installed. The vboxdrv kernel module "
+-                                  "was either not loaded, /dev/vboxdrv is not set up properly, "
+-                                  "or you are using EFI Secure Boot and the module is not signed "
+-                                  "in the right way for your system.  If necessary, try setting up "
+-                                  "the kernel module again by executing "
+-                                  "'/sbin/vboxconfig' as root");
++                    pszError = N_("Please install the virtualbox-dkms package "
++                                  "and execute 'modprobe vboxdrv' as root");
+ #else
+                     pszError = N_("VirtualBox kernel driver not installed");
+ #endif
+Index: virtualbox/src/VBox/Frontends/VirtualBox/src/main.cpp
+===================================================================
+--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/main.cpp
++++ virtualbox/src/VBox/Frontends/VirtualBox/src/main.cpp
+@@ -98,8 +98,9 @@
+ 
+ QString g_QStrHintLinuxNoDriver = QApplication::tr(
+     "The VirtualBox Linux kernel driver is either not loaded or not set "
+-    "up correctly. Please try setting it up again by executing<br/><br/>"
+-    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
++    "up correctly. Please reinstall virtualbox-dkms "
++    "package and load the kernel module by executing<br/><br/>"
++    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
+     "as root.<br/><br/>"
+     "If your system has EFI Secure Boot enabled you may also need to sign "
+     "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
+@@ -118,7 +119,7 @@
+     "The VirtualBox kernel modules do not match this version of "
+     "VirtualBox. The installation of VirtualBox was apparently not "
+     "successful. Executing<br/><br/>"
+-    "  <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
++    "  <font color=blue>'modprobe vboxdrv'</font><br/><br/>"
+     "may correct this. Make sure that you are not mixing builds "
+     "of VirtualBox from different sources."
+     );