X Strike Force X.Org X11 SVN commit: r3517 - trunk/debian/xorg/debian
Author: barbier
Date: 2006-09-26 17:27:00 -0400 (Tue, 26 Sep 2006)
New Revision: 3517
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.config.in
trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
Fix handling of "Generic Video Card" and "Generic Monitor" strings
in xserver-xorg.{config,postinst}, previous changes were buggy and
these scripts could enter an endless loop.
Closes: #389506 Thanks Joshua Kwan.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-09-26 15:03:39 UTC (rev 3516)
+++ trunk/debian/xorg/debian/changelog 2006-09-26 21:27:00 UTC (rev 3517)
@@ -8,6 +8,12 @@
* Add Conflicts: with xserver-xfree86-dbg for the /usr/X11R6/bin
transition. Thanks to Bill Allombert for testing. Closes: #388633.
+ [ Denis Barbier ]
+ * Fix handling of "Generic Video Card" and "Generic Monitor" strings
+ in xserver-xorg.{config,postinst}, previous changes were buggy and
+ these scripts could enter an endless loop.
+ Closes: #389506 Thanks Joshua Kwan.
+
-- Steve Langasek <vorlon@debian.org> Thu, 21 Sep 2006 15:05:29 -0700
xorg (1:7.1.0-1) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-09-26 15:03:39 UTC (rev 3516)
+++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-09-26 21:27:00 UTC (rev 3517)
@@ -828,7 +828,7 @@
fi
if [ -z "$DEFAULT" ]; then
# fall back to some language-specific generic text
- db_get xserver-xorg/config/device/default-identifier
+ db_metaget xserver-xorg/config/device/default-identifier Description
DEFAULT=$RET
fi
# this question requires input validation
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-09-26 15:03:39 UTC (rev 3516)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-09-26 21:27:00 UTC (rev 3517)
@@ -336,7 +336,7 @@
# Set a sane monitor id default if probe fails
if [ -z "$MONITOR_IDENTIFIER" ]; then
# fall back to some language-specific generic text
- db_get xserver-xorg/config/monitor/default-identifier
+ db_metaget xserver-xorg/config/monitor/default-identifier Description
MONITOR_IDENTIFIER=$RET
fi
db_set xserver-xorg/config/monitor/identifier "$MONITOR_IDENTIFIER"
Reply to: