Author: dnusinow
Date: 2005-09-27 21:35:38 -0500 (Tue, 27 Sep 2005)
New Revision: 633
Modified:
trunk/debian/changelog
trunk/debian/rules
trunk/debian/xserver-xorg.config.in
trunk/debian/xserver-xorg.postinst.in
Log:
* Don't choke when the user doesn't select a video mode. This fix also
involves a patch to substitute the default resolutions list in both
the xserver-xorg.preinst and .postinst files using part of
debian/rules. Thanks Robert Millan. (closes: #322902, #330304)
+ This commit differs from the previous in that I applied a patch from
Robert for a more complete fix.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-28 02:18:40 UTC (rev 632)
+++ trunk/debian/changelog 2005-09-28 02:35:38 UTC (rev 633)
@@ -38,7 +38,10 @@
* Update general/055_lnx_evdev_keyboard.diff to properly use the "less
greater bar"-key (EV_KEY_102ND) on a pc102 keyboards. Thanks Pär
Andersson. (closes: #322253)
- * Don't choke when the user doesn't select a video mode. (closes: #322902)
+ * Don't choke when the user doesn't select a video mode. This fix also
+ involves a patch to substitute the default resolutions list in both
+ the xserver-xorg.preinst and .postinst files using part of
+ debian/rules. Thanks Robert Millan. (closes: #322902, #330304)
[ Branden Robinson ]
* Change xserver-xorg and xserver-xorg-dbg's recommendation of "discover1"
@@ -52,7 +55,7 @@
* Updated Czech translation (cs.po). Thanks, Miroslav Kure (closes:
#327506).
- -- David Nusinow <[EMAIL PROTECTED]> Tue, 27 Sep 2005 22:16:30 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Tue, 27 Sep 2005 22:33:29 -0400
xorg-x11 (6.8.2.dfsg.1-7) unstable; urgency=high
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-09-28 02:18:40 UTC (rev 632)
+++ trunk/debian/rules 2005-09-28 02:35:38 UTC (rev 633)
@@ -76,6 +76,8 @@
SERVER_WRAPPER_OPT=-O2
endif
+DEFAULT_DCRESOLUTIONS="1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050,
1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800,
1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480"
+
# Set up parameters for the Debian build environment.
# Determine our architecture.
@@ -288,6 +290,7 @@
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
+ -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
Modified: trunk/debian/xserver-xorg.config.in
===================================================================
--- trunk/debian/xserver-xorg.config.in 2005-09-28 02:18:40 UTC (rev 632)
+++ trunk/debian/xserver-xorg.config.in 2005-09-28 02:35:38 UTC (rev 633)
@@ -486,8 +486,7 @@
if [ "$RET" != "10 xserver-xfree86/config/display/modes doesn't exist" ];
then
db_subst xserver-xorg/config/display/modes choices "$RET"
else
- # remember to keep this list in sync with postinst.in. Yes, it sucks!
- db_subst xserver-xorg/config/display/modes choices "1920x1440, 1920x1200,
1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024,
1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768,
800x600, 640x480"
+ db_subst xserver-xorg/config/display/modes choices @DEFAULT_DCRESOLUTIONS@
fi
# migrate keyboard/rules
db_get xserver-xorg/config/inputdevice/keyboard/rules
Modified: trunk/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xserver-xorg.postinst.in 2005-09-28 02:18:40 UTC (rev
632)
+++ trunk/debian/xserver-xorg.postinst.in 2005-09-28 02:35:38 UTC (rev
633)
@@ -394,7 +394,7 @@
DCRESOLUTIONS="$RET"
DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/, / /g')
else
- DCRESOLUTIONS="1920x1440 1920x1200 1856x1392 1792x1344 1680x1050 1600x1200
1440x900 1400x1050 1280x1024 1280x960 1280x854 1280x800 1280x768 1200x800
1152x864 1152x768 1024x768 800x600 640x480"
+ [EMAIL PROTECTED]@
fi
if [ -n "$RESOLUTIONS" ]; then
DCRESOLUTIONS=$(for i in $DCRESOLUTIONS $RESOLUTIONS; do echo $i; done |
sort -unr)
@@ -423,6 +423,9 @@
# if we are here we did not detect the frequencies, but we have the
resolution.
# get the highest resolution.
db_get xserver-xorg/config/display/modes
+ if [ -z "$RET" ]; then
+ [EMAIL PROTECTED]@
+ fi
MAXRES=$(echo $RET | sed -e 's/,//g')
MAXRES=$(for i in $MAXRES; do echo $i; done | sort -unr | head -n 1)
# set a sane default for mode-list
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
