~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/src/VBoxRegistrationDlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - 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
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
661
661
         << "Moldova, Republic of"
662
662
         << "Monaco"
663
663
         << "Mongolia"
 
664
         << "Montenegro"
664
665
         << "Montserrat"
665
666
         << "Morocco"
666
667
         << "Mozambique"
702
703
         << "Sao Tome & Principe"
703
704
         << "Saudi Arabia"
704
705
         << "Senegal"
 
706
         << "Serbia"
705
707
         << "Seychelles"
706
708
         << "Sierra Leone"
707
709
         << "Singapore"
750
752
         << "Western Sahara"
751
753
         << "Western Samoa"
752
754
         << "Yemen"
753
 
         << "Yugoslavia"
754
755
         << "Zambia"
755
756
         << "Zimbabwe";
756
757
    mCbNewCountry->addItems (list);