xorg: Changes to 'debian-unstable'
debian/changelog | 7 ++++++-
debian/xserver-xorg.postinst.in | 23 +++++++++++------------
2 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit 628b7dacad6e864715438826547b753b6b06d24a
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Jan 6 13:49:16 2008 -0500
* Don't ask the bus ID question to anyone who it's not necessary for
Hardcoding the bus ID is bad. The server already uses the same algorithm
and more to figure out which PCI ID's have video cards, so don't replicate
it. Currently we only ask people who have ppc, SGI indigos, and multiple
heads on sparc.
diff --git a/debian/changelog b/debian/changelog
index 9a8bbeb..0c65d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,13 @@ xorg (1:7.3+10) UNRELEASED; urgency=low
Closes: #442892, #448845, #410889, #443397, #242952, #271599
+ Remove discover and discover1 from the xserver-xorg recommends
+ Remove autodetect_video_card and multiple_possible_x-driver templates
+ * Don't ask the bus ID question to anyone who it's not necessary for
+ Hardcoding the bus ID is bad. The server already uses the same algorithm
+ and more to figure out which PCI ID's have video cards, so don't replicate
+ it. Currently we only ask people who have ppc, SGI indigos, and multiple
+ heads on sparc.
- -- David Nusinow <dnusinow@debian.org> Sat, 05 Jan 2008 19:02:39 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 06 Jan 2008 13:40:33 -0500
xorg (1:7.3+9) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index d8c2236..14c50cf 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -559,15 +559,8 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
# only one in the machine (broken PCI bus code in the XFree86 X server, most
# likely). If there are multiple video cards, we need to configure one as the
# primary head.
- # Warty: always feed this info.
- MULTIHEAD=yes
if [ "$ARCH" = "powerpc" ] || [ "$MULTIHEAD" = "yes" ]; then
- if [ "$ARCH" = "powerpc" ]; then
- PRIORITY=medium
- fi
- if [ "$MULTIHEAD" = "yes" ]; then
- PRIORITY=medium
- fi
+ PRIORITY=medium
if which lspci > /dev/null 2>&1; then
# Try to guess the correct BusID.
VIDEO_CARD=$(LC_ALL=C lspci -n | grep -E "(Class )?0300:" | sort -n | head -n 1 \
@@ -605,11 +598,17 @@ if [ -n "$FIRSTINST" ] || [ -n "$RECONFIGURE" ]; then
fi
fi
- # this question requires input validation
- if [ -n "$DEFAULT" ]; then
- auto_answer validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id "$DEFAULT"
+ # For most people, asking this question at all is a bad idea. Only do it
+ # if we have a need to do so, as defined by setting the priority
+ if [ "$PRIORITY" = "medium" ]; then
+ # this question requires input validation
+ if [ -n "$DEFAULT" ]; then
+ auto_answer validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id "$DEFAULT"
+ else
+ validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id || debug_report_status "validate_bus_id_db_input $(priority_ceil $PRIORITY) xserver-xorg/config/device/bus_id" "$?"
+ fi
else
- validate_bus_id_db_input "$(priority_ceil $PRIORITY)" xserver-xorg/config/device/bus_id || debug_report_status "validate_bus_id_db_input $(priority_ceil $PRIORITY) xserver-xorg/config/device/bus_id" "$?"
+ db_set xserver-xorg/config/device/bus_id ""
fi
# use fbcon kernel functions?
Reply to: