~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Main/testcase/Makefile.kmk

  • 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:
124
124
tstHostHardwareLinux_TEMPLATE  = VBOXR3TSTEXE
125
125
tstHostHardwareLinux_SOURCES   = \
126
126
        tstHostHardwareLinux.cpp \
127
 
        ../linux/HostHardwareLinux.cpp \
128
 
        ../linux/vbox-dbus.cpp
 
127
        ../linux/HostHardwareLinux.cpp
129
128
tstHostHardwareLinux_INCS      = . ../include
130
129
tstHostHardwareLinux_DEFS      = \
131
130
        VBOX_TEST_USB_LINUX \
 
131
        TESTCASE \
132
132
        $(if $(VBOX_WITH_LINUX_COMPILER_H),VBOX_WITH_LINUX_COMPILER_H,) \
133
133
        $(if $(VBOX_WITH_DBUS),VBOX_WITH_DBUS,) \
134
134
        $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,)