-
Committer:
Bazaar Package Importer
-
Author(s):
Felix Geyer
-
Date:
2009-09-14 18:25:07 UTC
-
mfrom:
(0.4.1 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090914182507-c98g07mq16hjmn6d
Tags: 3.0.6-dfsg-1ubuntu1
* Merge from debian unstable (LP: #429697), 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
- virtualbox, virtualbox-* (names of the upstream proprietary packages)
conflict with virtualbox-ose (LP: #379878)
* Make debug package depend on normal or guest utils package
* Drop patches/22-pulseaudio-stubs.dpatch (applied upstream)
* Rename Ubuntu specific patches to uXX-*.dpatch
* Fix lintian warnings in maintainer scripts