← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to debian/patches/13-module-mismatch.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-10-13 23:06:00 UTC
  • mfrom: (0.3.2 upstream) (0.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20091013230600-xhu2pwizq0wo63l9
Tags: 3.0.8-dfsg-1ubuntu1
https://launchpad.net/bugs/444812
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/434503
* Merge from debian unstable (LP: #444812), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
* Try to remove existing dkms modules before adding the new modules
  (LP: #434503)
  - debian/virtualbox-ose-source.postinst
  - debian/virtualbox-ose-guest-source.postinst
* Don't fail if dkms modules have already been removed
  - debian/virtualbox-ose-source.prerm
  - debian/virtualbox-ose-guest-source.prerm

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/13-module-mismatch.dpatch
4
4
## DP: Adjusts failure message with Ubuntu specific solution.
5
5
 
6
6
@DPATCH@
7
 
 
8
 
diff -Naurp virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp
9
 
--- virtualbox-ose-1.6.2-dfsg.orig/src/VBox/VMM/VM.cpp  2008-05-14 15:09:39.000000000 +0000
10
 
+++ virtualbox-ose-1.6.2-dfsg/src/VBox/VMM/VM.cpp       2008-06-23 16:10:30.000000000 +0000
11
 
@@ -293,9 +293,11 @@ VMR3DECL(int)   VMR3Create(PFNVMATERROR 
 
7
diff -urNad virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp
 
8
--- virtualbox-ose-3.0.8-dfsg~/src/VBox/VMM/VM.cpp      2009-10-07 13:43:36.542988533 +0200
 
9
+++ virtualbox-ose-3.0.8-dfsg/src/VBox/VMM/VM.cpp       2009-10-07 13:43:37.342988388 +0200
 
10
@@ -383,9 +383,11 @@
12
11
                     break;
13
12
                 case VERR_VERSION_MISMATCH:
14
13
                 case VERR_VM_DRIVER_VERSION_MISMATCH: