X Strike Force XFree86 SVN commit: r2169 - trunk/debian
Author: branden
Date: 2005-02-08 01:47:05 -0500 (Tue, 08 Feb 2005)
New Revision: 2169
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
In xserver-xfree86's config script, if the discover, mdetect, or get-did
(from the read-edid package) commands are not available, set the
corresponding autodetection question to false and mark it as seen. That
way, if one of the hardware detection packages is subsequently installed,
the user is not confusingly shown a "do autodection?" debconf question,
and then nothing done about the answer.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-02-08 06:11:42 UTC (rev 2168)
+++ trunk/debian/CHANGESETS 2005-02-08 06:47:05 UTC (rev 2169)
@@ -250,4 +250,12 @@
suitable for submission to upstream.
2167
+In xserver-xfree86's config script, if the discover, mdetect, or get-did
+(from the read-edid package) commands are not available, set the
+corresponding autodetection question to false and mark it as seen. That
+way, if one of the hardware detection packages is subsequently installed,
+the user is not confusingly shown a "do autodection?" debconf question,
+and then nothing done about the answer.
+ 2169
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-02-08 06:11:42 UTC (rev 2168)
+++ trunk/debian/changelog 2005-02-08 06:47:05 UTC (rev 2169)
@@ -191,8 +191,15 @@
this quiets build-time warnings. Also document why this patch is not yet
suitable for submission to upstream.
- -- Branden Robinson <branden@debian.org> Mon, 31 Jan 2005 16:14:26 -0500
+ * In xserver-xfree86's config script, if the discover, mdetect, or get-did
+ (from the read-edid package) commands are not available, set the
+ corresponding autodetection question to false and mark it as seen. That
+ way, if one of the hardware detection packages is subsequently installed,
+ the user is not confusingly shown a "do autodection?" debconf question,
+ and then nothing done about the answer.
+ -- Branden Robinson <branden@debian.org> Tue, 8 Feb 2005 01:41:54 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2005-02-08 06:11:42 UTC (rev 2168)
+++ trunk/debian/xserver-xfree86.config.in 2005-02-08 06:47:05 UTC (rev 2169)
@@ -580,6 +580,13 @@
fi
else
debug_echo "could not autodetect X server: discover not found"
+ # Set the question's answer to false (and mark it as seen) so that in the
+ # event discover is installed later and this package is configured again,
+ # the autodetection question is not asked, and then nothing done about it
+ # because the subsequent questions have already been answered. Checking the
+ # value of $RECONFIGURE is not as reliable as I'd hoped.
+ db_set xserver-xfree86/autodetect_video_card "false"
+ db_fset xserver-xfree86/autodetect_video_card seen "true"
fi
else
debug_echo "not prompting for video card autodetection; reconfiguring"
@@ -913,7 +920,17 @@
if [ -z "$RECONFIGURE" ]; then
while :; do
# bail out if autodetection tool not available
- which mdetect > /dev/null 2>&1 || break
+ which mdetect > /dev/null 2>&1 || \
+ {
+ # Set the question's answer to false (and mark it as seen) so that in the
+ # event mdetect is installed later and this package is configured again,
+ # the autodetection question is not asked, and then nothing done about it
+ # because the subsequent questions have already been answered. Checking
+ # the value of $RECONFIGURE is not as reliable as I'd hoped.
+ db_set xserver-xfree86/autodetect_mouse "false"
+ db_fset xserver-xfree86/autodetect_mouse seen "true"
+ break
+ }
auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xfree86/autodetect_mouse "false"
db_get xserver-xfree86/autodetect_mouse
if [ "$RET" = "true" ]; then
@@ -1074,6 +1091,13 @@
fi
else
debug_echo "could not autodetect monitor frequencies; get-edid not found"
+ # Set the question's answer to false (and mark it as seen) so that in the
+ # event read-edid is installed later and this package is configured again,
+ # the autodetection question is not asked, and then nothing done about it
+ # because the subsequent questions have already been answered. Checking the
+ # value of $RECONFIGURE is not as reliable as I'd hoped.
+ db_set xserver-xfree86/autodetect_monitor "false"
+ db_fset xserver-xfree86/autodetect_monitor seen "true"
fi
else
debug_echo "not prompting for monitor autodetection; reconfiguring"
Reply to: