X Strike Force X.Org X11 SVN commit: r654 - trunk/debian
Author: dnusinow
Date: 2005-10-04 18:36:42 -0500 (Tue, 04 Oct 2005)
New Revision: 654
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Fix xserver-xorg debconfage issues with autodetection. If the user
chooses to autodetect values, the original values in the debconf
templates are reset to ensure that the autodetection works. Thanks Daniel
Stone.
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-10-04 02:50:23 UTC (rev 653)
+++ trunk/debian/TODO 2005-10-04 23:36:42 UTC (rev 654)
@@ -8,10 +8,6 @@
xorg-x11 6.8.2-8 (unstable)
--------------------------
-* Fix the remaining bugs with upgrades from xfree86 packages
- + Any issue remaining with the xserver debconfage and removing the auto-clear
- on reconfigure
-
xorg-x11 6.9 (experimental)
---------------------------
* Update manifest-install-reconcile's data lists so the tool is usable again.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-10-04 02:50:23 UTC (rev 653)
+++ trunk/debian/changelog 2005-10-04 23:36:42 UTC (rev 654)
@@ -44,6 +44,9 @@
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.
* 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.
@@ -64,7 +67,7 @@
* debian/control: Changed xutils' dependency on ssh to ssh-server and
ssh-client. ssh is not longer a package, now that openssh splitted in two.
- -- David Martínez Moreno <ender@debian.org> Sun, 2 Oct 2005 12:57:57 +0200
+ -- David Nusinow <dnusinow@debian.org> Tue, 4 Oct 2005 19:33:08 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-10-04 02:50:23 UTC (rev 653)
+++ trunk/debian/xserver-xorg.config.in 2005-10-04 23:36:42 UTC (rev 654)
@@ -623,6 +623,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 +1293,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 +1435,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: