X Strike Force X.Org X11 SVN commit: r908 - trunk/debian
Author: dnusinow
Date: 2005-11-28 20:46:04 -0500 (Mon, 28 Nov 2005)
New Revision: 908
Modified:
trunk/debian/changelog
trunk/debian/xserver-xorg.config.in
Log:
* Make autodetection only reset questions on configure portion of package
install as well.
*** 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-27 05:46:47 UTC (rev 907)
+++ trunk/debian/changelog 2005-11-29 01:46:04 UTC (rev 908)
@@ -16,7 +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.
+ * Only reset autodetection questions on first install or reconfigure, and
+ then only in the configure portion of the package install.
(closes: #332369, #332637, #334340).
[ Christian Perrier ]
@@ -25,7 +26,7 @@
* Added Romanian translation (ro.po). Thanks, Eddy Petrisor!
(closes: #338547, #338902).
- -- David Nusinow <dnusinow@debian.org> Wed, 23 Nov 2005 20:57:20 -0500
+ -- David Nusinow <dnusinow@debian.org> Mon, 28 Nov 2005 20:44:00 -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-27 05:46:47 UTC (rev 907)
+++ trunk/debian/xserver-xorg.config.in 2005-11-29 01:46:04 UTC (rev 908)
@@ -626,8 +626,10 @@
# Reset values of templates that are to be autodetected to make sure that
# the autodetection actually applies
if [ -n "$RECONFIGURE" ] || [ -n "$FIRSTINST" ]; then
- db_reset shared/default-x-server
- db_reset xserver-xorg/config/device/driver
+ if [ $1 = "configure" ]; then
+ db_reset shared/default-x-server
+ db_reset xserver-xorg/config/device/driver
+ fi
fi
if [ $NSERVERS -eq 0 ]; then
debug_echo "could not autodetect X server: no video card detected," \
@@ -1298,8 +1300,10 @@
# Reset values of templates that are to be autodetected to make sure that
# the autodetection actually applies
if [ -n "$RECONFIGURE" ] || [ -n "$FIRSTINST" ]; then
- db_reset xserver-xorg/config/inputdevice/mouse/port
- db_reset xserver-xorg/config/inputdevice/mouse/protocol
+ if [ $1 = "configure" ]; then
+ db_reset xserver-xorg/config/inputdevice/mouse/port
+ db_reset xserver-xorg/config/inputdevice/mouse/protocol
+ fi
fi
set +e
# we get only one mouse since we can't handle more anyway (yet)
@@ -1438,7 +1442,7 @@
if which get-edid > /dev/null 2>&1; then
auto_answer db_input "$(priority_ceil $PRIORITY)" xserver-xorg/autodetect_monitor "false"
db_get xserver-xorg/autodetect_monitor
- if [ "$RET" = "true" ]; then
+ if [ "$RET" = "true" ] && [ $1 = "configure" ]; 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
Reply to: