diff --git a/debian/changelog b/debian/changelog index 27d11312b..16fd5e88f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ linux (4.3-1~exp2) UNRELEASED; urgency=medium MOUSE_ELAN_I2C_SMBUS (Closes: #791631) * [armhf] hsi: Enable CMT_SPEECH as module (Closes: #791819) * [armhf] power: Enable BATTERY_RX51 as module (Closes: #791820) + * [x86] psmouse: Enable MOUSE_PS2_VMMOUSE (Closes: #802929) + - linux-image: Add versioned Breaks on xserver-xorg-input-vmmouse to + avoid driver conflicts [ Ian Campbell ] * [armel/orion5x] Enable Device Tree for orion5x. Patch from Roger Shimizu diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 1598f1249..224defcd1 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -13,6 +13,7 @@ image-file: arch/x86/boot/bzImage bootloaders: grub-pc grub-efi extlinux configs: install-stem: vmlinuz +breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] headers%gcc-5: linux-compiler-gcc-5-x86 diff --git a/debian/config/i386/defines b/debian/config/i386/defines index dcec36868..90f576294 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -18,6 +18,7 @@ part-long-pae: This kernel requires PAE (Physical Address Extension). bootloaders: grub-pc extlinux configs: install-stem: vmlinuz +breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99) [relations] headers%gcc-5: linux-compiler-gcc-5-x86 diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ca7317f21..c91333518 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -730,8 +730,7 @@ CONFIG_INPUT_IDEAPAD_SLIDEBAR=m ## CONFIG_INPUT_MOUSE=y CONFIG_MOUSE_PS2=m -#. Must not enable this until xserver-xorg-input-vmmouse is upgraded -# CONFIG_MOUSE_PS2_VMMOUSE is not set +CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m CONFIG_MOUSE_BCM5974=m