xorg: Changes to 'debian-unstable'
debian/changelog | 12 ++++++++++--
debian/control | 2 +-
debian/rules | 5 ++++-
debian/scripts/vars | 2 +-
debian/scripts/vars.alpha | 2 +-
debian/scripts/vars.amd64 | 2 ++
debian/scripts/vars.arm | 2 +-
debian/scripts/vars.armeb | 2 +-
debian/scripts/vars.hppa | 2 ++
debian/scripts/vars.hurd-i386 | 2 +-
debian/scripts/vars.i386 | 3 +++
debian/scripts/vars.ia64 | 5 ++++-
debian/scripts/vars.kfreebsd-i386 | 2 +-
debian/scripts/vars.m32r | 2 +-
debian/scripts/vars.m68k | 2 +-
debian/scripts/vars.mips | 2 +-
debian/scripts/vars.mipsel | 2 +-
debian/scripts/vars.sparc | 2 +-
debian/xserver-xorg.postinst.in | 4 ++--
19 files changed, 39 insertions(+), 18 deletions(-)
New commits:
commit c5f45c962d5187e32a73dafc9b64cb9f52dac21c
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Wed Apr 25 16:58:25 2007 +0300
debian/xserver-xorg.postinst.in: ATI vendor string was changed in discover-data_2.2006.08.15, so edit them to reflect the change.
diff --git a/debian/changelog b/debian/changelog
index ba93a62..6b67bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,8 +47,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
on amd64, hppa, i386, ia64.
* debian/scripts/vars: Add xserver-xorg-input-elographics to
XSERVER_XORG_INPUT_DEPENDS.
+ * debian/xserver-xorg.postinst.in: ATI vendor string was changed in
+ discover-data_2.2006.08.15, so edit them to reflect the change.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:34:14 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:56:19 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 3a1b748..7aca749 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1440,8 +1440,8 @@ xresprobeint() {
if [ "$DEVICE_DRIVER" = "ati" ]; then
# r128 is in the same 'special' list, AFAICT.
if [ "$DISPLAY_TYPE" = "lcd/lvds" ]; then
- if [ "$DEVICE_IDENTIFIER" = "ATI Technologies, Inc. Rage Mobility M3 (AGP)" ] || \
- [ "$DEVICE_IDENTIFIER" = "ATI Technologies, Inc. Rage Mobility M4 (AGP)" ] || \
+ if [ "$DEVICE_IDENTIFIER" = "ATI Technologies Inc Rage Mobility M3 (AGP)" ] || \
+ [ "$DEVICE_IDENTIFIER" = "ATI Technologies Inc Rage Mobility M4 (AGP)" ] || \
echo "$DEVICE_IDENTIFIER" | grep -q "Rage 128"; then
MONITOR_SYNC_RANGES="yes"
debug_echo "r128 laptop chipset detected; writing sync ranges"
commit a7f4ec0e2d3cf824752a64262b85046e7c28f004
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Wed Apr 25 16:35:38 2007 +0300
Add xserver-xorg-input-elographics to XSERVER_XORG_INPUT_DEPENDS.
diff --git a/debian/changelog b/debian/changelog
index 1619aae..ba93a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
archs.
* debian/{control,rules,scripts/vars.*}: Set XSERVER_XORG_DETECT_DEPENDS
on amd64, hppa, i386, ia64.
+ * debian/scripts/vars: Add xserver-xorg-input-elographics to
+ XSERVER_XORG_INPUT_DEPENDS.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:30:18 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:34:14 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/scripts/vars b/debian/scripts/vars
index d4c93bc..747eeea 100755
--- a/debian/scripts/vars
+++ b/debian/scripts/vars
@@ -12,4 +12,4 @@
# STAMP_DIR is where to place all the 'stamp' files that allows
# debian/rules to know when certain targets are done.
-XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom, xserver-xorg-input-evtouch"
+XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom, xserver-xorg-input-evtouch, xserver-xorg-input-elographics"
commit e76fc2c9707acbe43ab45cd0d6b2d3f92a338c5e
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Wed Apr 25 16:32:23 2007 +0300
debian/{control,rules,scripts/vars.*}: Set XSERVER_XORG_DETECT_DEPENDS on amd64, hppa, i386, ia64.
diff --git a/debian/changelog b/debian/changelog
index daddb19..1619aae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
/usr/X11R6/lib/X11/fonts
* debian/scripts/vars.*: Remove xserver-xorg-video-vmware from non-x86
archs.
+ * debian/{control,rules,scripts/vars.*}: Set XSERVER_XORG_DETECT_DEPENDS
+ on amd64, hppa, i386, ia64.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 15:52:49 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:30:18 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6331ca2..6c86c94 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,7 @@ Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
Depends: xserver-xorg-core (>= 2:1.2.99.905-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
-Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, xresprobe, mdetect, discover1 | discover
+Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, xresprobe, mdetect, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
diff --git a/debian/rules b/debian/rules
index 405fe08..39db7fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,9 @@ export DH_OPTIONS
# latest ABI is 7.0 final
SERVERABIBUMP = 7.1.0
+# Default list of detection packages
+XSERVER_XORG_DETECT_DEPENDS = ""
+
include debian/xsfbs/xsfbs.mk
# Get package version info.
@@ -89,7 +92,7 @@ binary-indep: build install
dh_compress
dh_fixperms
dh_installdeb
- dh_gencontrol
+ dh_gencontrol -- -VF:XServer-Xorg-Detect-Depends=$(XSERVER_XORG_DETECT_DEPENDS)
dh_md5sums
dh_builddeb
touch stamp-$@
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index cb97d8f..cea2705 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -7,3 +7,5 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xser
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+
+XSERVER_XORG_DETECT_DEPENDS="dmidecode"
diff --git a/debian/scripts/vars.hppa b/debian/scripts/vars.hppa
index cc44dbf..90a4e40 100755
--- a/debian/scripts/vars.hppa
+++ b/debian/scripts/vars.hppa
@@ -6,3 +6,5 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-nv, xserver-xorg-video-s3, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-sis, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vga, xserver-xorg-video-v4l"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+
+XSERVER_XORG_DETECT_DEPENDS="fbset"
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index aa5e300..4df572d 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -8,3 +8,6 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xser
# xserver-xorg-video-glide,
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+
+XSERVER_XORG_DETECT_DEPENDS="dmidecode"
+
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index b9d7df8..7e9ceb0 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -6,3 +6,6 @@
XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nv, 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-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-v4l"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
+
+XSERVER_XORG_DETECT_DEPENDS="dmidecode"
+
commit 037ec2ec12fc4a3f2700b566c3485a38089c5ae9
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Wed Apr 25 15:53:57 2007 +0300
debian/scripts/vars.*: Remove xserver-xorg-video-vmware from non-x86 archs.
diff --git a/debian/changelog b/debian/changelog
index 5b29936..daddb19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,8 +41,10 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
allowing x11-common to be installed by debootstrap.
* x11common.{dirs,links}: Don't ship or link to
/usr/X11R6/lib/X11/fonts
+ * debian/scripts/vars.*: Remove xserver-xorg-video-vmware from non-x86
+ archs.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Tue, 24 Apr 2007 18:40:53 +0300
+ -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 15:52:49 +0300
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/scripts/vars.alpha b/debian/scripts/vars.alpha
index 84ad0f8..afab4c8 100755
--- a/debian/scripts/vars.alpha
+++ b/debian/scripts/vars.alpha
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# , xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.arm b/debian/scripts/vars.arm
index aa5e300..4c26f80 100755
--- a/debian/scripts/vars.arm
+++ b/debian/scripts/vars.arm
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.armeb b/debian/scripts/vars.armeb
index aa5e300..4c26f80 100644
--- a/debian/scripts/vars.armeb
+++ b/debian/scripts/vars.armeb
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.hurd-i386 b/debian/scripts/vars.hurd-i386
index 7d69e87..90aac40 100644
--- a/debian/scripts/vars.hurd-i386
+++ b/debian/scripts/vars.hurd-i386
@@ -3,6 +3,6 @@
# 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, server-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-vmware, xserver-xorg-video-voodoo"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, server-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-kbd, xserver-xorg-input-mouse"
diff --git a/debian/scripts/vars.ia64 b/debian/scripts/vars.ia64
index d3e1493..b9d7df8 100755
--- a/debian/scripts/vars.ia64
+++ b/debian/scripts/vars.ia64
@@ -3,6 +3,6 @@
#
# 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-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nv, 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-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nv, 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-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-v4l"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
diff --git a/debian/scripts/vars.kfreebsd-i386 b/debian/scripts/vars.kfreebsd-i386
index 87d166e..10cf663 100755
--- a/debian/scripts/vars.kfreebsd-i386
+++ b/debian/scripts/vars.kfreebsd-i386
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tdfx, xserver-xorg-video-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.m32r b/debian/scripts/vars.m32r
index aa5e300..4c26f80 100755
--- a/debian/scripts/vars.m32r
+++ b/debian/scripts/vars.m32r
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.m68k b/debian/scripts/vars.m68k
index 2cd7de0..3ffe900 100755
--- a/debian/scripts/vars.m68k
+++ b/debian/scripts/vars.m68k
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.mips b/debian/scripts/vars.mips
index ac4f216..2afbc9a 100755
--- a/debian/scripts/vars.mips
+++ b/debian/scripts/vars.mips
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide
diff --git a/debian/scripts/vars.mipsel b/debian/scripts/vars.mipsel
index aa5e300..4c26f80 100755
--- a/debian/scripts/vars.mipsel
+++ b/debian/scripts/vars.mipsel
@@ -3,7 +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-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-cyrix, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-i810 | xserver-xorg-video-intel | xserver-xorg-video-i810-modesetting | xserver-xorg-video-intel-modesetting, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-newport, xserver-xorg-video-nsc, xserver-xorg-video-nv, 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-tga, xserver-xorg-video-trident, xserver-xorg-video-tseng, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-via, xserver-xorg-video-voodoo, xserver-xorg-video-v4l"
# xserver-xorg-video-glide,
diff --git a/debian/scripts/vars.sparc b/debian/scripts/vars.sparc
index 4c8b77f..4e82c2e 100755
--- a/debian/scripts/vars.sparc
+++ b/debian/scripts/vars.sparc
@@ -3,6 +3,6 @@
#
# 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-cirrus, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sunbw2, xserver-xorg-video-suncg14, xserver-xorg-video-suncg3, xserver-xorg-video-suncg6, xserver-xorg-video-sunffb, xserver-xorg-video-sunleo, xserver-xorg-video-suntcx, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-vmware, xserver-xorg-video-v4l"
+XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, xserver-xorg-video-ark, xserver-xorg-video-ati, xserver-xorg-video-chips, xserver-xorg-video-cirrus, xserver-xorg-video-dummy, xserver-xorg-video-fbdev, xserver-xorg-video-glint, xserver-xorg-video-i128, xserver-xorg-video-i740, xserver-xorg-video-imstt, xserver-xorg-video-mga, xserver-xorg-video-neomagic, xserver-xorg-video-nv, xserver-xorg-video-rendition, xserver-xorg-video-s3virge, xserver-xorg-video-savage, xserver-xorg-video-siliconmotion, xserver-xorg-video-sunbw2, xserver-xorg-video-suncg14, xserver-xorg-video-suncg3, xserver-xorg-video-suncg6, xserver-xorg-video-sunffb, xserver-xorg-video-sunleo, xserver-xorg-video-suntcx, xserver-xorg-video-tdfx, xserver-xorg-video-trident, xserver-xorg-video-vesa, xserver-xorg-video-vga, xserver-xorg-video-v4l"
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, xserver-xorg-input-kbd, xserver-xorg-input-mouse, xserver-xorg-input-synaptics, xserver-xorg-input-wacom"
Reply to: