diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index c242be618..9195a6fb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ virtualbox-ose (2.2.0-dfsg-1) unstable; urgency=low * New upstream version. * Move X11 guest utils into separate packages, closes: #520438 + * Also switched them to new X.Org X server version. * Move QT4 based user interface into separate package, closes: #508395 * Added new URL for WineD3D guest additions, closes: 522672 * Documented problem with kernel 2.6.29, closes: #518739 diff --git a/debian/control b/debian/control index ca5420469..04d5e84df 100644 --- a/debian/control +++ b/debian/control @@ -147,10 +147,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, virtualbox-ose-guest-utils, pciutils -Conflicts: xserver-xorg-core (< 2:1.4) -Recommends: xserver-xorg-core (>= 2:1.4) -Provides: xserver-xorg-video-2, - xserver-xorg-input-2 +Conflicts: xserver-xorg-core (< 2:1.6) +Recommends: xserver-xorg-core (>= 2:1.6) +Provides: xserver-xorg-video-5, + xserver-xorg-input-5 Description: x86 virtualization solution - X11 guest utilities VirtualBox is a free x86 virtualization solution allowing a wide range of x86 operating systems such as Windows, DOS, BSD or Linux to run on a diff --git a/debian/rules b/debian/rules index e61ba96e6..2bb338df8 100755 --- a/debian/rules +++ b/debian/rules @@ -111,8 +111,8 @@ binary-arch: build install dh_installmenu -s dh_install -s -chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl - -install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so - -install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uxname)/usr/lib/xorg/modules/input/vboxmouse_drv.so + -install -m 644 out/bin/additions/vboxvideo_drv_16.so debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so + -install -m 644 out/bin/additions/vboxmouse_drv_16.so debian/$(uxname)/usr/lib/xorg/modules/input/vboxmouse_drv.so -install -m 755 src/VBox/Additions/x11/Installer/VBoxRandR.sh debian/$(uxname)/usr/bin/VBoxRandR -chrpath -d debian/$(uxname)/usr/bin/VBoxClient -chrpath -d debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so |