← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR3/VM.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR3/VM.cpp
1
 
/* $Id: VM.cpp 38229 2011-07-28 17:41:41Z vboxsync $ */
 
1
/* $Id: VM.cpp $ */
2
2
/** @file
3
3
 * VM - Virtual Machine
4
4
 */
423
423
                case VERR_VERSION_MISMATCH:
424
424
                case VERR_VM_DRIVER_VERSION_MISMATCH:
425
425
                    pszError = N_("The version of the VirtualBox kernel modules and the version of "
426
 
                                  "VirtualBox application are not matching. You can correct this by "
427
 
                                  "installing the virtualbox-ose-dkms package through apt-get.");
 
426
                                  "VirtualBox application are not matching. You can correct this by "
 
427
                                  "either installing the correct virtualbox-ose-modules package "
 
428
                                  "(if available) through apt-get or by building it manually with: "
 
429
                                  "module-assistant auto-install virtualbox-ose");
428
430
                    break;
429
431
                default:
430
432
                    pszError = N_("Unknown error initializing kernel driver");