Please merge virtualbox-ose 3.0.4-dfsg-1 (universe) from Debian unstable (main)

The diff between Debian and Ubuntu is pretty huge. Is this really just "Fix FTBFS with PulseAudio 0.9.16" as indicated in the changelog?

daniel@bert:~$ diffstat debian-ubuntu.debdiff | tail -n 1
 48 files changed, 1272 insertions(+), 406 deletions(-)
daniel@bert:~$

The rest of the Debian-Ubuntu diff are remaining changes from previous versions.

In short these are:
- Enable DKMS support on virtualbox host and guest modules (LP: #267097)
- Autoload kernel module
  - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
- Disable update action
  - patches/13-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
  - debian/control
  - debian/lpi-bug.xpm
  - debian/patches/21-lp-integration.dpatch
- virtualbox-{2.0,2.1,2.2,3.0} (names of the upstream proprietary packages)
  conflict with virtualbox-ose
  - debian/control

Should I mention the remaining changes with every merge?

I'll sponsor this in the next days, before FeatureFreeze.

And yes, changes to Debian should be mentioned in every merge. Please fix that.

Package with updated changelog:

virtualbox-ose (3.0.4-dfsg-1ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #416314), 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/13-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
      - debian/control
      - debian/lpi-bug.xpm
      - debian/patches/21-lp-integration.dpatch
    - virtualbox, virtualbox-* (names of the upstream proprietary packages)
      conflict with virtualbox-ose (LP: #379878)
  * Fix FTBFS with PulseAudio 0.9.16
    - debian/patches/00list
    - debian/patches/22-pulseaudio-stubs.dpatch

@Daniel: can you please sponsor this package ASAP? I need it in order to upload the new vboxgtk release.

This bug was fixed in the package virtualbox-ose - 3.0.4-dfsg-1ubuntu1

---------------
virtualbox-ose (3.0.4-dfsg-1ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #416314), 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/13-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
      - debian/control
      - debian/lpi-bug.xpm
      - debian/patches/21-lp-integration.dpatch
    - virtualbox, virtualbox-* (names of the upstream proprietary packages)
      conflict with virtualbox-ose (LP: #379878)
  * Fix FTBFS with PulseAudio 0.9.16
    - debian/patches/00list
    - debian/patches/22-pulseaudio-stubs.dpatch

 -- Felix Geyer <email address hidden> Thu, 13 Aug 2009 12:39:26 +0200