X Strike Force X.Org X11 SVN commit: r656 - branches/6.9/debian
Author: dnusinow
Date: 2005-10-04 20:21:17 -0500 (Tue, 04 Oct 2005)
New Revision: 656
Modified:
branches/6.9/debian/TODO
branches/6.9/debian/changelog
branches/6.9/debian/xserver-xorg.config.in
Log:
Merge changes from trunk revision 651 to current HEAD (655)
Modified: branches/6.9/debian/TODO
===================================================================
--- branches/6.9/debian/TODO 2005-10-05 00:39:14 UTC (rev 655)
+++ branches/6.9/debian/TODO 2005-10-05 01:21:17 UTC (rev 656)
@@ -8,12 +8,6 @@
xorg-x11 6.8.2-8 (unstable)
--------------------------
-* Grab updates to ati and nv drivers (and xf86PciInfo.h) from upstream CVS HEAD
- so that we don't regress relative to Ubuntu (patches dropped in r179).
-
-* Fix the remaining bugs with upgrades from xfree86 packages
- + #?
-
xorg-x11 6.9 (experimental)
---------------------------
* Update manifest-install-reconcile's data lists so the tool is usable again.
Modified: branches/6.9/debian/changelog
===================================================================
--- branches/6.9/debian/changelog 2005-10-05 00:39:14 UTC (rev 655)
+++ branches/6.9/debian/changelog 2005-10-05 01:21:17 UTC (rev 656)
@@ -149,6 +149,11 @@
debian/rules. Thanks Robert Millan. (closes: #322902, #330304)
* Don't reset all xserver-xorg debconf templates when "dpkg-reconfigure
xserver-xorg" is called. (closes: #320241, #318634)
+ + Reset values for templates that are affected by autodetection only when
+ the user actually opts for autodetection. This allows autodetection to
+ actually work. Thanks Daniel Stone.
+ + Ensure that all templates containing the name "autodetect" are reset in
+ the auto_answer function
* Provide extra insurance for autodetecting drivers on installation. Also
update driver default lists for amd64 and i386. (closes: #320634)
* Have packages built specifically for etch be counted as official builds.
@@ -167,7 +172,7 @@
* Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
#327506).
- -- David Nusinow <dnusinow@debian.org> Thu, 29 Sep 2005 19:25:03 -0400
+ -- David Nusinow <dnusinow@debian.org> Tue, 4 Oct 2005 20:37:37 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: branches/6.9/debian/xserver-xorg.config.in
===================================================================
--- branches/6.9/debian/xserver-xorg.config.in 2005-10-05 00:39:14 UTC (rev 655)
+++ branches/6.9/debian/xserver-xorg.config.in 2005-10-05 01:21:17 UTC (rev 656)
@@ -332,6 +332,10 @@
DEFAULT_ANSWER=$4
set +e
debug_echo "auto_answer() \"$INPUT_COMMAND $PRIORITY $TEMPLATE\" with default \"$DEFAULT_ANSWER\""
+ if echo $TEMPLATE | grep "autodetect" > /dev/null; then
+ db_reset $TEMPLATE
+ echo "auto_answer() resetting template $TEMPLATE"
+ fi
db_fget "$TEMPLATE" seen
# are we re-configuring?
if [ -z "$FIRSTINST" ] && [ "$RET" = "true" ]; then
@@ -623,6 +627,10 @@
db_get xserver-xorg/autodetect_video_card
AUTODETECT_VIDEO_CARD="$RET"
if [ "$AUTODETECT_VIDEO_CARD" = "true" ]; then
+ # Reset values of templates that are to be autodetected to make sure that
+ # the autodetection actually applies
+ db_reset shared/default-x-server
+ db_reset xserver-xorg/config/device/driver
if [ $NSERVERS -eq 0 ]; then
debug_echo "could not autodetect X server: no video card detected," \
"or no server known for it"
@@ -1289,6 +1297,10 @@
which mdetect > /dev/null 2>&1 || break
db_get xserver-xorg/autodetect_mouse
if [ "$RET" = "true" ]; then
+ # Reset values of templates that are to be autodetected to make sure that
+ # the autodetection actually applies
+ db_reset xserver-xorg/config/inputdevice/mouse/port
+ db_reset xserver-xorg/config/inputdevice/mouse/protocol
set +e
# we get only one mouse since we can't handle more anyway (yet)
MDETECT_OUTPUT=$(mdetect -x | tail -n 2)
@@ -1427,6 +1439,16 @@
auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/autodetect_monitor "false"
db_get xserver-xorg/autodetect_monitor
if [ "$RET" = "true" ]; then
+ # Reset values of templates that are to be autodetected to be sure that
+ # the autodetection actually applies
+ db_reset xserver-xorg/config/monitor/screen-size
+ db_reset xserver-xorg/config/monitor/mode-list
+ db_reset xserver-xorg/config/monitor/identifier
+ db_reset xserver-xorg/config/monitor/use_sync_ranges
+ db_reset xserver-xorg/config/monitor/horiz-sync
+ db_reset xserver-xorg/config/monitor/vert-refresh
+ db_reset xserver-xorg/config/display/modes
+ db_reset xserver-xorg/config/display/default_depth
set +e
EDID_DUMP=$( (get-edid | parse-edid) 2> /dev/null)
set -e
Reply to: