Author: dnusinow
Date: 2005-11-23 20:59:38 -0500 (Wed, 23 Nov 2005)
New Revision: 893
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Only reset autodetection questions on first install or reconfigure.
(closes: #332369, #332637, #334340).
*** NOTE: I haven't tested this yet, but will soon. If someone wants to
beat me to it, please do so! It'd be nice to put this bug behind us. ***
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-11-24 01:30:08 UTC (rev 892)
+++ trunk/debian/changelog 2005-11-24 01:59:38 UTC (rev 893)
@@ -16,6 +16,8 @@
(closes: #336748)
* Fix binary server target to not choke on Xorg.1 manpage install. Thanks
Bill Allombert. (closes: #334740)
+ * Only reset autodetection questions on first install or reconfigure.
+ (closes: #332369, #332637, #334340).
[ Christian Perrier ]
* Updated Russian translation (ru.po). Thanks, Yuri Kozlov!
@@ -23,7 +25,7 @@
* Added Romanian translation (ro.po). Thanks, Eddy Petrisor!
(closes: #338547, #338902).
- -- David Nusinow <[EMAIL PROTECTED]> Wed, 23 Nov 2005 20:27:25 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 23 Nov 2005 20:57:20 -0500
xorg-x11 (6.8.2.dfsg.1-10) unstable; urgency=low
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-11-24 01:30:08 UTC (rev 892)
+++ trunk/debian/xserver-xorg.config.in 2005-11-24 01:59:38 UTC (rev 893)
@@ -625,8 +625,10 @@
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 [ -n "$RECONFIGURE" ] || [ -n "$FIRSTINST" ]; then
+ db_reset shared/default-x-server
+ db_reset xserver-xorg/config/device/driver
+ fi
if [ $NSERVERS -eq 0 ]; then
debug_echo "could not autodetect X server: no video card detected," \
"or no server known for it"
@@ -1295,8 +1297,10 @@
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
+ if [ -n "$RECONFIGURE" ] || [ -n "$FIRSTINST" ]; then
+ db_reset xserver-xorg/config/inputdevice/mouse/port
+ db_reset xserver-xorg/config/inputdevice/mouse/protocol
+ fi
set +e
# we get only one mouse since we can't handle more anyway (yet)
MDETECT_OUTPUT=$(mdetect -x | tail -n 2)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
