X Strike Force X.Org X11 SVN commit: r2790 - trunk/debian/xorg/debian
Author: barbier
Date: 2006-08-14 09:04:45 -0400 (Mon, 14 Aug 2006)
New Revision: 2790
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/rules
trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
Fix list of display resolution in maintainer scripts, the
patch sent to #330304 had been broken when updated to 7.0.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-08-14 12:27:47 UTC (rev 2789)
+++ trunk/debian/xorg/debian/changelog 2006-08-14 13:04:45 UTC (rev 2790)
@@ -7,6 +7,8 @@
without .svn files being shipped in /etc/X11/Xsession.d.
* Add m32r support. Thanks Kazuhiro Inaoka (closes: #376060)
* Add ppc64 support. Thanks Andreas Jochens (closes: #362085)
+ * Fix list of display resolution in maintainer scripts, the
+ patch sent to #330304 had been broken when updated to 7.0.
* Debconf translations updates
- Dzongkha (Tenzin Dendup). Closes: #382959
Modified: trunk/debian/xorg/debian/rules
===================================================================
--- trunk/debian/xorg/debian/rules 2006-08-14 12:27:47 UTC (rev 2789)
+++ trunk/debian/xorg/debian/rules 2006-08-14 13:04:45 UTC (rev 2790)
@@ -46,6 +46,8 @@
SCRIPTS=$(shell ls debian/*.config.in debian/*.postinst.in debian/*.postrm.in debian/*.preinst.in debian/*.prerm.in)
+DEFAULT_DCRESOLUTIONS="1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480"
+
scripts: stamp-scripts
stamp-scripts: genscripts validatescripts
touch $@
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-08-14 12:27:47 UTC (rev 2789)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-08-14 13:04:45 UTC (rev 2790)
@@ -391,10 +391,12 @@
fi
db_metaget xserver-xorg/config/display/modes choices
- DEFRESOLUTIONS="1920x1440 1920x1200 1856x1392 1792x1344 1680x1050 1600x1200 1440x900 1400x1050 1280x1024 1280x960 1280x854 1280x800 1280x768 1200x800 1152x864 1152x768 1024x768 800x600 640x480"
+ DEFRESOLUTIONS="$(echo @DEFAULT_DCRESOLUTIONS@ | sed -e 's/, / /g')"
if [ -n "$RET" ]; then
DCRESOLUTIONS="$RET"
DCRESOLUTIONS="$(echo $DCRESOLUTIONS | sed -e 's/, / /g')"
+ else
+ DCRESOLUTIONS=$DEFRESOLUTIONS
fi
if [ -n "$RESOLUTIONS" ]; then
DCRESOLUTIONS="$(for i in $DCRESOLUTIONS $DEFRESOLUTIONS $RESOLUTIONS; do echo $i; done | sort -t x -k1,1nr -k2,2nr -u)"
Reply to: