xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/scripts/vars.armeb | 3 +--
debian/scripts/vars.armel | 3 +--
debian/scripts/vars.armhf | 4 +---
4 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit ebd8e72e701b5d11c0615ae241effef06265b287
Author: Bryce Harrington <bryce@canonical.com>
Date: Mon Nov 26 12:18:53 2012 -0800
Drop -ati and -nouveau for default installation on arm.
diff --git a/debian/changelog b/debian/changelog
index 45b24b3..5d9886e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.7+1ubuntu5) UNRELEASED; urgency=low
+
+ * scripts/vars.arm*: Don't include -ati or -nouveau, to save
+ installation space. The drivers build for some arm targets, but no
+ known devices actually work with them.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 26 Nov 2012 12:15:57 -0800
+
xorg (1:7.7+1ubuntu4) quantal; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 1f30685..313eb7a 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,8 +3,7 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
- xserver-xorg-video-cirrus, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-sisusb, \
xserver-xorg-video-vesa, \
diff --git a/debian/scripts/vars.armel b/debian/scripts/vars.armel
index f9cf9ba..8c83ff8 100644
--- a/debian/scripts/vars.armel
+++ b/debian/scripts/vars.armel
@@ -3,8 +3,7 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
- xserver-xorg-video-fbdev, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-fbdev, \
xserver-xorg-video-modesetting, \
xserver-xorg-video-omap, \
xserver-xorg-video-sisusb, \
diff --git a/debian/scripts/vars.armhf b/debian/scripts/vars.armhf
index 5ac6d6a..f77c066 100644
--- a/debian/scripts/vars.armhf
+++ b/debian/scripts/vars.armhf
@@ -3,11 +3,9 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
- xserver-xorg-video-fbdev, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-fbdev, \
xserver-xorg-video-modesetting, \
xserver-xorg-video-omap, \
- xserver-xorg-video-nouveau, \
xserver-xorg-video-vesa, \
"
Reply to: