xorg: Changes to 'ubuntu'
Rebased ref, commits from common ancestor:
commit d7f18a8725a363fc8e943e0ca186ccecf5d98461
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Aug 3 01:56:02 2016 +0300
control: Drop vmmouse from -input-all depends, our kernel has had the virtual driver for some time.
diff --git a/debian/changelog b/debian/changelog
index b286dd3..029a254 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu4) UNRELEASED; urgency=medium
+
+ * control: Drop vmmouse from -input-all depends, our kernel has had
+ the virtual driver for some time.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 03 Aug 2016 01:54:36 +0300
+
xorg (1:7.7+13ubuntu3) xenial; urgency=medium
* control: Drop freedreno and void from video/input-all so that they
diff --git a/debian/control b/debian/control
index 4bb1398..4421d0f 100644
--- a/debian/control
+++ b/debian/control
@@ -80,7 +80,6 @@ Depends:
xserver-xorg-input-kbd [!linux-any],
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-wacom [!hurd-any !kfreebsd-any !s390x],
${misc:Depends},
commit caf55a20346d71f40b8544f9c27f3eec558b6d1f
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Mar 4 16:53:41 2016 +0200
control: Drop freedreno and void from video/input-all so that they don't block the transition while MIR's are being processed.
diff --git a/debian/changelog b/debian/changelog
index fb304fc..b286dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/debian/control b/debian/control
index 29814a9..4bb1398 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Depends:
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-nouveau [amd64 arm64 armhf i386 powerpc x32],
xserver-xorg-video-vesa [!s390x],
@@ -81,7 +81,7 @@ Depends:
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:
commit bcae57cba1be70bb37ea43735fe5e6b8d3436124
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 18 07:38:40 2016 +0200
release to staging ppa
diff --git a/debian/changelog b/debian/changelog
index 3a485db..fb304fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.7+13ubuntu2) UNRELEASED; urgency=medium
+xorg (1:7.7+13ubuntu2) xenial; urgency=medium
* control: Demote -intel to -video-all Recommends, allowing uninstall
without removing the metapackage.
commit d501af1ecf3d6bd8526ff58ff549ba58b59c1121
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Feb 18 07:35:25 2016 +0200
control: Demote -intel to -video-all Recommends, allowing uninstall without removing the metapackage.
diff --git a/debian/changelog b/debian/changelog
index 68e78bf..3a485db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+13ubuntu2) UNRELEASED; 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 --git a/debian/control b/debian/control
index 063d043..29814a9 100644
--- a/debian/control
+++ b/debian/control
@@ -57,12 +57,12 @@ Depends:
xserver-xorg-video-fbdev [!s390x],
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],
Reply to: