debian/changelog | 14 ++++++++------
debian/scripts/vars.arm | 23 +----------------------
debian/scripts/vars.armeb | 22 +---------------------
3 files changed, 10 insertions(+), 49 deletions(-)
New commits:
commit 87190c3d4b4970af744892a33308a9adb7a9fbc0
Author: Bryce Harrington <br...@canonical.com>
Date: Fri Apr 1 00:08:10 2011 -0700
Mention cleanup of vars.arm*
diff --git a/debian/changelog b/debian/changelog
index f3ecca7..c6095c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg (1:7.6+4ubuntu1) natty; urgency=low
- [Timo Aaltonen]
+ [ Timo Aaltonen ]
* Merge from Debian unstable. Remaining Ubuntu changes:
- Add apport hook
- Demote xfonts-{75DPI,100DPI} to Suggests. Demote xfonts-scalable to
@@ -26,15 +26,17 @@ xorg (1:7.6+4ubuntu1) natty; urgency=low
* control, rules: Don't build xsf-docs, markdown and wkhtmltopdf are in
universe.
- [Bryce Harrington]
+ [ Bryce Harrington ]
* apport/source_xorg.py:
- Include 'xinput list' output for input device issues.
- For amd64 arch's, include version of ia32-libs package.
- * scripts/amd64, scripts/i386: Include the -qxl video driver in
- video-all for amd64 and i386, to provide remote graphical
- desktop functionality for KVM.
+ * scripts/vars.amd64, scripts/vars.i386:
+ - Include the -qxl video driver in video-all for amd64 and i386, to
+ provide remote graphical desktop functionality for KVM.
+ * scripts/vars.arm, scripts/vars.armeb, scripts/vars.armel:
+ - Drop obscure drivers that are likely irrelevant for ARM.
- -- Bryce Harrington <br...@ubuntu.com> Thu, 31 Mar 2011 23:19:10 -0700
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 01 Apr 2011 00:05:38 -0700
xorg (1:7.6+4) unstable; urgency=low
commit ca186ff7d0dfdb15c04122067eef75cf846a702c
Author: Bryce Harrington <br...@canonical.com>
Date: Fri Apr 1 00:05:10 2011 -0700
Also update the arm and armeb video drivers same as armel
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index dfef521..1f30685 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,35 +3,14 @@
#
# 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_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
xserver-xorg-video-vesa, \
"
-# xserver-xorg-video-apm,
-# xserver-xorg-video-ark,
-# xserver-xorg-video-glide,
-# xserver-xorg-video-chips,
-# xserver-xorg-video-i128,
-# xserver-xorg-video-i740,
-# xserver-xorg-video-tseng,
-# xserver-xorg-video-voodoo,
-
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics"
-
XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index 87c6ba7..1f30685 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,34 +3,14 @@
#
# This file gets included by both debian/rules (make) AND the scripts in
# debian/scripts (Bourne shell).
-XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
- xserver-xorg-video-ark, \
- xserver-xorg-video-ati, \
- xserver-xorg-video-chips, \
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-cirrus, \
xserver-xorg-video-fbdev, \
- xserver-xorg-video-i128, \
- xserver-xorg-video-i740, \
- xserver-xorg-video-mga, \
- xserver-xorg-video-neomagic, \
- xserver-xorg-video-rendition, \
- xserver-xorg-video-s3, \
- xserver-xorg-video-s3virge, \
- xserver-xorg-video-savage, \
- xserver-xorg-video-siliconmotion, \
- xserver-xorg-video-sis, \
xserver-xorg-video-sisusb, \
- xserver-xorg-video-tdfx, \
- xserver-xorg-video-trident, \
- xserver-xorg-video-tseng, \
xserver-xorg-video-vesa, \
- xserver-xorg-video-voodoo, \
"
-# xserver-xorg-video-glide,
-
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-synaptics"
-
XSERVER_XORG_INPUT_RECOMMENDS="xserver-xorg-input-wacom"
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q5yt9-0006cv...@alioth.debian.org
