~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

Viewing all changes in revision 42.

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-05-25 22:51:39 UTC
  • mfrom: (0.3.6 upstream) (0.4.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100525225139-hpo777g413iyfvzu
Tags: 3.2.0-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Set x11 backport switch to "lucid".
  - VirtualBox should go in Accessories, not in System tools. (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop u03-fix-cpu-lockup.dpatch, fixed upstream.
* Remove Launchpad integration as (non-packaging) bugs should be reported
  upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: