diff -Nru xorg-7.7+13ubuntu1/debian/changelog xorg-7.7+13ubuntu3/debian/changelog
--- xorg-7.7+13ubuntu1/debian/changelog	2016-02-05 15:58:09.000000000 +0000
+++ xorg-7.7+13ubuntu3/debian/changelog	2016-03-04 14:53:12.000000000 +0000
@@ -1,3 +1,17 @@
+xorg (1:7.7+13ubuntu3) xenial; urgency=medium
+
+  * control: Drop freedreno and void from video/input-all so that they
+    don't block the transition while MIR's are being processed.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Fri, 04 Mar 2016 16:53:04 +0200
+
+xorg (1:7.7+13ubuntu2) xenial; urgency=medium
+
+  * control: Demote -intel to -video-all Recommends, allowing uninstall
+    without removing the metapackage.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Feb 2016 07:35:17 +0200
+
 xorg (1:7.7+13ubuntu1) xenial; urgency=medium
 
   * Merge from Debian.
diff -Nru xorg-7.7+13ubuntu1/debian/control xorg-7.7+13ubuntu3/debian/control
--- xorg-7.7+13ubuntu1/debian/control	2016-02-05 15:57:32.000000000 +0000
+++ xorg-7.7+13ubuntu3/debian/control	2016-03-04 14:49:30.000000000 +0000
@@ -55,14 +55,14 @@
  xserver-xorg-video-amdgpu [!hurd-any !kfreebsd-any !s390x],
  xserver-xorg-video-ati [!hurd-any !s390x],
  xserver-xorg-video-fbdev [!s390x],
- xserver-xorg-video-freedreno [armel armhf],
+# xserver-xorg-video-freedreno [armel armhf],
  xserver-xorg-video-dummy [s390x],
- xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-nouveau [amd64 arm64 armhf i386 powerpc x32],
  xserver-xorg-video-vesa [!s390x],
  xserver-xorg-video-vmware [amd64 hurd-i386 i386 x32],
  ${misc:Depends},
 Recommends:
+ xserver-xorg-video-intel [amd64 i386 kfreebsd-any x32],
  xserver-xorg-video-qxl [amd64 i386 x32],
 Suggests:
  xserver-xorg-video-geode [i386],
@@ -81,7 +81,7 @@
  xserver-xorg-input-mouse [!linux-any],
  xserver-xorg-input-synaptics [!s390x],
  xserver-xorg-input-vmmouse [amd64 i386 x32],
- xserver-xorg-input-void [s390x],
+# xserver-xorg-input-void [s390x],
  xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390x],
  ${misc:Depends},
 Recommends: