Author: fabbione
Date: 2004-10-30 00:39:22 -0500 (Sat, 30 Oct 2004)
New Revision: 1990
Added:
branches/ubuntu/debian/patches/989_warty_add_extra_modelines_from_xorg.diff
Modified:
branches/ubuntu/debian/CHANGESETS
branches/ubuntu/debian/README
branches/ubuntu/debian/changelog
branches/ubuntu/debian/rules
branches/ubuntu/debian/xfree86-common.init
branches/ubuntu/debian/xserver-xfree86.config.in
branches/ubuntu/debian/xserver-xfree86.postinst.in
branches/ubuntu/debian/xserver-xfree86.templates
Log:
Import 4.3.0.dfsg.1-6ubuntu14 release.
Modified: branches/ubuntu/debian/CHANGESETS
===================================================================
--- branches/ubuntu/debian/CHANGESETS 2004-10-30 05:37:22 UTC (rev 1989)
+++ branches/ubuntu/debian/CHANGESETS 2004-10-30 05:39:22 UTC (rev 1990)
@@ -179,7 +179,7 @@
targets to handle PO and POT file updates using our local script, and
document the recommended procedure in debian/README. Hopefully the real
debconf-updatepo will be fixed soon.
- 1695, 1696
+ 1695, 1696, 1785
Update debian/po/*.{po,pot} files to update comment header and get effects
of a debconf-updatepo bugfix which misidentified template types in some
@@ -506,4 +506,9 @@
but users may find it useful with broken keymaps.
1773
+Fix some lingering references to an unreleased version of xserver-common
+in the debian/control file; bump the versioning up to the subsequent
+package release.
+ 1783
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/ubuntu/debian/README
===================================================================
--- branches/ubuntu/debian/README 2004-10-30 05:37:22 UTC (rev 1989)
+++ branches/ubuntu/debian/README 2004-10-30 05:39:22 UTC (rev 1990)
@@ -1,4 +1,4 @@
-$Id: README 1695 2004-07-29 07:22:25Z branden $
+$Id: README 1695M 2004-09-03 05:46:24Z (local) $
This file attempts to explain some of the oddities of the XFree86 Debian
source package by describing the files and directories not usually found in
@@ -68,7 +68,8 @@
900-999 patches that should not be sent upstream
- 900-998 Debian-specific behavior and enhancements
+ 900-988 Debian-specific behavior and enhancements
+ 989-998 Warty-specific behavior and enhancements
999 experimental or debugging patches (should not
generally be present in a production release)
Modified: branches/ubuntu/debian/changelog
===================================================================
--- branches/ubuntu/debian/changelog 2004-10-30 05:37:22 UTC (rev 1989)
+++ branches/ubuntu/debian/changelog 2004-10-30 05:39:22 UTC (rev 1990)
@@ -1,3 +1,27 @@
+xfree86 (4.3.0.dfsg.1-6ubuntu14) warty; urgency=low
+
+ * Resync last bits from svn trunk up to 1793.
+ * Switch to the new xfree86-common.init script.
+ * Allocated 10 patch slots (989-998) for warty (debian/README).
+ * Add debian/patches/989_warty_add_extra_modelines_from_xorg.diff
+ * Import validate_monitor_frequency_expr and
+ validate_monitor_frequency_db_input from branches/debconf-overhaul into
+ our xserver-xfree86.postinst.in.
+ * Add missing db_get call in xserver-xfree86.postinst.in when
+ selection-method is set to Medium.
+ * Import more horiz-sync/vert-refresh sets from branches/debconf-overhaul
+ into our xserver-xfree86.postinst.in and xserver-xfree86.templates.
+ * Improve frequency autoguessing logic to set much better sane defaults
+ around and to prefer well known values over autoguessed once.
+ * Import improved calculation of xserver-xfree86/config/device/use_fbdev
+ answer from branches/debconf-overhaul into our xserver-xfree86.config.in.
+ * Import server module selection enanchments from branches/debconf-overhaul.
+ * Import new regexp for lspci from branches/debconf-overhaul to handle
+ correctly presence of Class or not.
+ * Stop asking questions on upgrades.
+
+ -- Fabio M. Di Nitto <[EMAIL PROTECTED]> Fri, 03 Sep 2004 07:28:01 +0200
+
xfree86 (4.3.0.dfsg.1-6ubuntu13) warty; urgency=low
* Add dvorak symlink for macintosh keycode users.
@@ -586,6 +610,10 @@
function more strict, so it doesn't regard open-ended ranges like "40-" as
valid.
+ * Fix some lingering references to an unreleased version of xserver-common
+ in the debian/control file; bump the versioning up to the subsequent
+ package release.
+
Changes by Robert Millan:
* Get glxinfo to link properly with g++ (instead of adding -lstdc++).
@@ -618,7 +646,7 @@
missing to enable this feature. No keymaps currently use this feature,
but users may find it useful with broken keymaps.
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 30 Aug 2004 14:22:49 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 1 Sep 2004 04:42:22 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Added:
branches/ubuntu/debian/patches/989_warty_add_extra_modelines_from_xorg.diff
===================================================================
--- branches/ubuntu/debian/patches/989_warty_add_extra_modelines_from_xorg.diff
2004-10-30 05:37:22 UTC (rev 1989)
+++ branches/ubuntu/debian/patches/989_warty_add_extra_modelines_from_xorg.diff
2004-10-30 05:39:22 UTC (rev 1990)
@@ -0,0 +1,37 @@
+$Id$
+
+Add extra modelines. Patch grabbed from RedHat/X.org tree by Daniel Stone.
+
+Patch added by Fabio Massimo Di Nitto.
+
+diff -Nur xc.orig/programs/Xserver/hw/xfree86/etc/extramodes
xc/programs/Xserver/hw/xfree86/etc/extramodes
+--- xc.orig/programs/Xserver/hw/xfree86/etc/extramodes 2002-11-11
04:21:46.000000000 +0000
++++ xc/programs/Xserver/hw/xfree86/etc/extramodes 2004-09-03
06:19:22.000000000 +0000
+@@ -10,15 +10,27 @@
+ # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz
+ ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync
+vsync
+
++# 1152x864 @ 85Hz (Red Hat custom modeline)
++ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync
-vsync
++
+ # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz
+ ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync
+vsync
+
++# 1400x1050 @ 70Hz (Red Hat custom modeline) hsync: 76.8kHz
++ModeLine "1400x1050" 151.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync
+vsync
++
+ # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz
+ ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync
+vsync
+
++# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz
++ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync
+vsync
++
+ # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz
+ Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync
-vsync
+
++# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50
KHz
++Modeline "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync
-VSync
++
+ # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz
+ Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync
+vsync
+
Property changes on:
branches/ubuntu/debian/patches/989_warty_add_extra_modelines_from_xorg.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: branches/ubuntu/debian/rules
===================================================================
--- branches/ubuntu/debian/rules 2004-10-30 05:37:22 UTC (rev 1989)
+++ branches/ubuntu/debian/rules 2004-10-30 05:39:22 UTC (rev 1990)
@@ -194,7 +194,7 @@
# Generate the debconf templates POT file header.
debian/po/pothead: debian/po/pothead.in
sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%Y-%m-%d %H:%M:%S%z"/)' \
+ -e 's/DATE/$(shell date "+%F %X%z"/)' \
<debian/po/pothead.in >$@
# Update POT and PO files.
Modified: branches/ubuntu/debian/xfree86-common.init
===================================================================
--- branches/ubuntu/debian/xfree86-common.init 2004-10-30 05:37:22 UTC (rev
1989)
+++ branches/ubuntu/debian/xfree86-common.init 2004-10-30 05:39:22 UTC (rev
1990)
@@ -8,26 +8,37 @@
SOCKET_DIR=/tmp/.X11-unix
ICE_DIR=/tmp/.ICE-unix
+. /lib/lsb/init-functions
+. /etc/default/rcS
+
set_up_socket_dir () {
- echo -n "Setting up X server socket directory $SOCKET_DIR..."
+ if [ "$VERBOSE" != no ]; then
+ log_begin_msg "Setting up X server socket directory $SOCKET_DIR..."
+ else
+ log_begin_msg "Setting up X server socket directory..."
+ fi
if [ -e $SOCKET_DIR -a ! -d $SOCKET_DIR ]; then
mv $SOCKET_DIR $SOCKET_DIR.$$
fi
mkdir -p $SOCKET_DIR
chown 0:0 $SOCKET_DIR
chmod 1777 $SOCKET_DIR
- echo "done."
+ log_end_msg 0
}
set_up_ice_dir () {
- echo -n "Setting up ICE socket directory $ICE_DIR..."
+ if [ "$VERBOSE" != no ]; then
+ log_begin_msg "Setting up ICE socket directory $ICE_DIR..."
+ else
+ log_begin_msg "Setting up ICE socket directory..."
+ fi
if [ -e $ICE_DIR -a ! -d $ICE_DIR ]; then
mv $ICE_DIR $ICE_DIR.$$
fi
mkdir -p $ICE_DIR
chown 0:0 $ICE_DIR
chmod 1777 $ICE_DIR
- echo "done."
+ log_end_msg 0
}
case "$1" in
@@ -45,7 +56,7 @@
;;
*)
- echo "Usage: /etc/init.d/xfree86-common
{start|stop|restart|reload|force-reload}"
+ log_success_msg "Usage: /etc/init.d/xfree86-common
{start|stop|restart|reload|force-reload}"
exit 1
;;
esac
Modified: branches/ubuntu/debian/xserver-xfree86.config.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:37:22 UTC
(rev 1989)
+++ branches/ubuntu/debian/xserver-xfree86.config.in 2004-10-30 05:39:22 UTC
(rev 1990)
@@ -17,7 +17,7 @@
#INCLUDE_SHELL_LIB#
CONFIG_DIR=/etc/X11
-SERVER_SYMLINK="$CONFIG_DIR/X"
+server_syMLINK="$CONFIG_DIR/X"
XF86CONFIG="$CONFIG_DIR/XF86Config-4"
THIS_SERVER=/usr/bin/X11/XFree86
@@ -457,6 +457,21 @@
db_set xserver-xfree86/config/modules "$SELECTED_MODULES"
fi
+# Add automatic loading of the "v4l" (Video4Linux) support module if upgrading
+# from a package version that didn't support it.
+if [ -n "$2" ] && dpkg --compare-versions "$2" lt "4.3.0.dfsg.1-6ubuntu14";
then
+ db_get xserver-xfree86/config/modules
+ # Only add the module if it's not already there and extmod is loaded.
+ if expr "$RET" : ".*extmod.*" >/dev/null 2>&1; then
+ if ! expr "$RET" : ".*v4l.*" >/dev/null 2>&1; then
+ # Add it to the end with a comma and space prepended
+ # if there are alreadyi some selected modules.
+ SELECTED_MODULES="${RET:+$RET, }v4l"
+ db_set xserver-xfree86/config/modules "$SELECTED_MODULES"
+ fi
+ fi
+fi
+
# migrate from ATI driver sub-modules to ATI driver
db_get xserver-xfree86/config/device/driver
case "$RET" in
@@ -612,7 +627,12 @@
# video driver selection
# priority of xserver-xfree86/config/device/driver
-PRIORITY=high
+if [ -z "$RECONFIGURE" ]; then
+ PRIORITY=high
+else
+ # drop priority on upgrades
+ PRIORITY=medium
+fi
DRIVER_DIR=/usr/X11R6/lib/modules/drivers
@@ -765,7 +785,7 @@
fi
if which lspci > /dev/null 2>&1; then
# Try to guess the correct BusID.
- VIDEO_CARD=$(LC_ALL=C lspci -n | grep "Class 0300:" | sort -n | head -n 1 \
+ VIDEO_CARD=$(LC_ALL=C lspci -n | grep -E "(Class )?0300:" | sort -n | head
-n 1 \
| cut -d\ -f1)
if [ -n "$VIDEO_CARD" ]; then
# Recent versions of lspci report a four-digit domain as the first field.
@@ -818,33 +838,41 @@
fi
# use fbcon kernel functions?
-USE_FBDEV=
+
+case "$ARCH" in
+ alpha|hurd-i386|i386)
+ USE_FBDEV=false
+ ;;
+ *)
+ USE_FBDEV=true
+ ;;
+esac
+
if [ -e /proc/fb ]; then
- FB_TYPE="$(grep '^0 ' /proc/fb | awk '{print $2}')"
+ FB_TYPE="$(grep '^0 ' /proc/fb | sed 's/[^[:space:]] //')"
# did we actually get back anything?
if [ -n "$FB_TYPE" ]; then
case "$FB_TYPE" in
OFfb|VESA)
# generic framebuffer that doesn't support UseFBDev
+ USE_FBDEV=false
;;
*)
# other framebuffers do support UseFBDEV
- USE_FBDEV=yes
+ USE_FBDEV=true
;;
esac
fi
fi
-if [ -n "$USE_FBDEV" ]; then
- auto_answer db_input "$(priority_ceil medium)"
xserver-xfree86/config/device/use_fbdev "true"
-else
- db_get xserver-xfree86/config/device/use_fbdev || debug_report_status
"db_get xserver-xfree86/config/device/use_fbdev" "$?"
- if [ "$RET" = "true" ]; then
- debug_echo "xserver-xfree86/config/device/use_fbdev is \"true\" but
/proc/fb does not exist, is empty, or reports a framebuffer type with which
UseFBDev cannot be used; setting template to \"false\""
- db_set xserver-xfree86/config/device/use_fbdev false
- fi
+db_get xserver-xfree86/config/device/use_fbdev || debug_report_status "db_get
xserver-xfree86/config/device/use_fbdev"
+if [ "$RET" = "true" ] && [ "$USE_FBDEV" = "false" ]; then
+ debug_echo "xserver-xfree86/config/device/use_fbdev is \"true\" but /proc/fb
does not exist, is empty, or reports a framebuffer type with which UseFBDev
cannot be used; setting template to \"false\""
+ db_set xserver-xfree86/config/device/use_fbdev false
fi
+auto_answer db_input "$(priority_ceil medium)"
xserver-xfree86/config/device/use_fbdev "$USE_FBDEV"
+
# keyboard setup
# Warty change: try to guess keyboard layout from $LANG
@@ -909,7 +937,7 @@
* ) LAYOUT="UNKNOWN" XKBOPTIONS="" ;;
esac
-if [ "$LAYOUT" = "UNKNOWN" ]; then
+if [ "$LAYOUT" = "UNKNOWN" ] && [ -z "$RECONFIGURE" ]; then
PRIORITY=high
LAYOUT="us"
else
@@ -1360,14 +1388,7 @@
}
# server modules to load
-# XXX: damnit, explicitly loading the dri module is broken for sunffb users :-P
-db_get xserver-xfree86/config/device/driver
-if [ "$ARCH" = "sparc" -a "$RET" = "sunffb" ]; then
- MODULE_LIST="GLcore, bitmap, dbe, ddc, extmod, freetype, glx, int10, record,
speedo, type1, vbe"
-else
- MODULE_LIST="GLcore, bitmap, dbe, ddc, dri, extmod, freetype, glx, int10,
record, speedo, type1, vbe"
-fi
-auto_answer db_input "$(priority_ceil low)" xserver-xfree86/config/modules
"$MODULE_LIST"
+db_input "$(priority_ceil low)" xserver-xfree86/config/modules || true
db_go
# files and dri sections
Modified: branches/ubuntu/debian/xserver-xfree86.postinst.in
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:37:22 UTC
(rev 1989)
+++ branches/ubuntu/debian/xserver-xfree86.postinst.in 2004-10-30 05:39:22 UTC
(rev 1990)
@@ -67,40 +67,95 @@
set -e
}
+validate_monitor_frequency_expr () {
+ # syntax: validate_monitor_frequency_expr expression
+ #
+ # Confirm that the given expression is a valid monitor frequency expression
+ # per XF86Config-4(5x). Note that this does *not* handle (comma-delimited)
+ # tuples. We expect a single value or range with an optional unit suffix.
+ #
+ # Note: We don't check to see if the latter value in a range is actually
+ # greater than the former, and we don't check to see if any of the numeric
+ # values actually make sense. I.e., 0 Hz may not actually be valid as far as
+ # the X server is concerned, but 10000 Hz might be okay whereas 10000 kHz
+ # might not be. It would take quite a bit of code to sort all that out. We
+ # only take some of the bullets out of the user's gun -- not all of them.
+ #
+ # Return true (0) if the expression is valid, and false (1) if it is not.
+
+ local func regex
+
+ func="validate_monitor_frequency_expr"
+
+ # Validate function arguments.
+ if [ $# -ne 1 ]; then
+ internal_error "$func(): called with wrong number of arguments; expected" \
+ "1, got $@"
+ fi
+
+
regex='^[[:space:]]*0*[0-9]+(\.[0-9]+)?(-0*[0-9]+(\.[0-9]+)?)?([[:space:]]*[kM]?Hz)?$'
+
+ if echo "$1" | grep -Eiq "$regex"; then
+ return 0
+ else
+ return 1
+ fi
+}
+
validate_monitor_frequency_db_input () {
- # Syntax: validate_monitor_frequency_db_input priority template
+ # syntax: validate_monitor_frequency_db_input priority template
#
# validate monitor frequency input
+
+ local expr_is_valid freq_expr func priority safe template
+
+ func="validate_monitor_frequency_db_input"
+
+ # Validate function arguments.
if [ $# -ne 2 ]; then
- echo "internal error: validate_monitor_frequency_db_input() called with
wrong number of arguments: $*" >&2
- exit 1
+ internal_error "$func(): called with wrong number of arguments; expected" \
+ "2, got $@"
fi
- PRIORITY=$1
- TEMPLATE=$2
- db_get "$TEMPLATE"
- SAFE="$RET"
+
+ priority=$1
+ template=$2
+ db_get "$template"
+ safe="$RET"
set +e
while :; do
- db_input "$PRIORITY" "$TEMPLATE"
+ db_input "$priority" "$template"
# is the question going to be asked?
if [ $? -eq 30 ]; then
break # no; bail out of validation loop
fi
db_go
- db_get "$TEMPLATE"
+ db_get "$template"
# This is a string, and needs input validation; a regex match will have to
# do. We force the first character to be a number to avoid hideous
problems
# in the debconf dialog frontend in 0.3.83 (it needs to be one anyway). We
- # don't allow values less than 10.
- if echo "$RET" | grep -qE \
- '^[0-9]{2,3}(\.[0-9]+)?(-[0-9]{2,3}(\.[0-9]+)?)?$'; then
- break # valid input
+ # need to handle multiple expressions, delimited by commas. See
+ # XF86Config-4(5x) for more information.
+ if expr "$RET" : ".*,.*" >/dev/null 2>&1; then
+ expr_is_valid=true
+ echo "$RET" | tr -s ',' '\n' | while read freq_expr; do
+ if ! validate_monitor_frequency_expr "$freq_expr"; then
+ expr_is_valid=
+ fi
+ done
+ if [ -n "$expr_is_valid" ]; then
+ break
+ fi
+ else
+ if validate_monitor_frequency_expr "$RET"; then
+ break
+ fi
fi
+
# we only get to this point if the input was invalid; restore the known
# good value in case we are interrupted before the user provides a
# valid one
- db_set "$TEMPLATE" "$SAFE"
- db_fset "$TEMPLATE" seen false
+ db_set "$template" "$safe"
+ db_fset "$template" seen false
# now show the user the error message
db_fset xserver-xfree86/config/monitor/range_input_error seen false
db_input critical xserver-xfree86/config/monitor/range_input_error
@@ -207,6 +262,9 @@
DCRESOLUTIONS=$(for i in $DCRESOLUTIONS $RESOLUTIONS; do echo $i; done |
sort -unr)
DCRESOLUTIONS=$(echo $DCRESOLUTIONS | sed -e 's/ /, /g')
fi
+ else
+ # drop priority on upgrades
+ PRIORITY=medium
fi
db_metaget xserver-xfree86/config/display/modes choices
@@ -229,27 +287,37 @@
db_input $PRIORITY xserver-xfree86/config/display/modes || true
db_go
+ db_subst xserver-xfree86/config/monitor/selection-method choices "Simple,
Medium, Advanced"
+ db_subst xserver-xfree86/config/monitor/selection-method default "Medium"
+
if [ -n "$HORIZ_SYNC" -a -n "$VERT_REFRESH" ]; then
- # monitor frequencies detected
+ # monitor frequencies detected, we set them as defaults and we switch to
Advanced mode.
+ # there is no need to get crazy feeding "Medium"
db_set xserver-xfree86/config/monitor/horiz-sync "$HORIZ_SYNC"
db_set xserver-xfree86/config/monitor/vert-refresh "$VERT_REFRESH"
+ db_set xserver-xfree86/config/monitor/selection-method "Advanced"
else
- # get the highest resolution selected or detected to create sane defaults
+ # if we are here we did not detect the frequencies, but we have the
resolution.
+ # get the highest resolution.
db_get xserver-xfree86/config/display/modes
- HMAX=$(echo $RET | sed -e 's/,//g')
- HMAX=$(for i in $HMAX; do echo $i; done | sort -unr | head -n 1 | cut -d
"x" -f 1)
+ 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
+ MAXRES="$MAXRES @ 60Hz"
+ db_set xserver-xfree86/config/monitor/mode-list "$MAXRES"
# apparently all the known resolution/horiz-sync combinantion have a ratio
that
# can go from 19 to 21. Only one exception was 18. We can safely assume a
ratio of 20
# for default setup. DDC should do the rest.
- HMAX=$(expr $HMAX / 20)
+ HMAX=$(echo "$MAXRES" | cut -d "x" -f 1)
+ HMAX=$(expr "$HMAX" / 20)
+ # set sane defaults as fallback, in case there is no mode-list match
otherwise we
+ # prefer a well known match.
db_set xserver-xfree86/config/monitor/horiz-sync "28-$HMAX"
- # sane default for everything. Experts will do this manually or
reconfiguring.
db_set xserver-xfree86/config/monitor/vert-refresh "43-60"
+ # since we are guessing it's a good idea to set the level to Medium
+ db_set xserver-xfree86/config/monitor/selection-method "Medium"
fi
- db_subst xserver-xfree86/config/monitor/selection-method choices "Simple,
Medium, Advanced"
- db_subst xserver-xfree86/config/monitor/selection-method default "Medium"
- db_set xserver-xfree86/config/monitor/selection-method "Medium"
db_input low xserver-xfree86/config/monitor/selection-method || true
db_go
@@ -285,15 +353,20 @@
Medium)
db_input low xserver-xfree86/config/monitor/mode-list || true
db_go
+ db_get xserver-xfree86/config/monitor/mode-list
case "$RET" in
"640x480 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-33"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
;;
- "640x480 @ 72Hz"|"800x600 @ 60Hz")
+ "640x480 @ 72Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-38"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
;;
+ "800x600 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "28-38"
+ db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
+ ;;
"800x600 @ 72Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-48"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
@@ -302,6 +375,11 @@
db_set xserver-xfree86/config/monitor/horiz-sync "30-54"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
;;
+ "832x624 @ 75Hz")
+ # This is a Macintosh (m68k and OldWorld PowerPC) mode.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-50"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
"1024x768 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "28-49"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
@@ -310,22 +388,48 @@
db_set xserver-xfree86/config/monitor/horiz-sync "30-57"
db_set xserver-xfree86/config/monitor/vert-refresh "43-72"
;;
- "1024x768 @ 75Hz"|"1280x960 @ 60Hz")
+ "1024x768 @ 75Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-60"
db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
;;
- "1280x1024 @ 60Hz")
- db_set xserver-xfree86/config/monitor/horiz-sync "30-65"
- db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ "1152x768 @ 54.8Hz")
+ # This is a 15" PowerBook G4 mode; its video hardware (LCD) was also
+ # capable of 896x600 and 720x480 pixels at a 3:2 aspect ratio and
+ # 1024x768, 800x600, and 640x480 pixels at a 4:3 aspect ratio, so
give
+ # its horizontal and vertical ranges a little more "headroom" than
+ # that required by this specific mode to accomodate the others.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-50"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-72"
;;
"1152x864 @ 75Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-68"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
;;
+ "1280x960 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-60"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
"1280x960 @ 85Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-92"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
;;
+ "1280x1024 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-65"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1400x1050 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-67"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
+ ;;
+ "1400x1050 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-85"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-80"
+ ;;
+ "1600x1024 @ 85Hz")
+ # This is an SGI 1600SW mode.
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-70"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-90"
+ ;;
"1600x1200 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-75"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
@@ -334,10 +438,14 @@
db_set xserver-xfree86/config/monitor/horiz-sync "30-94"
db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
;;
- "1600x1200 @ 85Hz"|"1792x1344 @ 75Hz")
+ "1600x1200 @ 85Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-107"
db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
;;
+ "1792x1344 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-107"
+ db_set xserver-xfree86/config/monitor/vert-refresh "50-85"
+ ;;
"1792x1344 @ 60Hz")
db_set xserver-xfree86/config/monitor/horiz-sync "30-84"
db_set xserver-xfree86/config/monitor/vert-refresh "50-75"
@@ -358,6 +466,22 @@
db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
;;
+ "1920x1440 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-130"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
+ ;;
+ "2048x1536 @ 60Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-100"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-85"
+ ;;
+ "2048x1536 @ 75Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-125"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-100"
+ ;;
+ "2048x1536 @ 85Hz")
+ db_set xserver-xfree86/config/monitor/horiz-sync "30-140"
+ db_set xserver-xfree86/config/monitor/vert-refresh "60-160"
+ ;;
esac
;;
Advanced)
Modified: branches/ubuntu/debian/xserver-xfree86.templates
===================================================================
--- branches/ubuntu/debian/xserver-xfree86.templates 2004-10-30 05:37:22 UTC
(rev 1989)
+++ branches/ubuntu/debian/xserver-xfree86.templates 2004-10-30 05:39:22 UTC
(rev 1990)
@@ -61,8 +61,8 @@
Template: xserver-xfree86/config/modules
Type: multiselect
-Choices: GLcore, bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record,
speedo, type1, vbe, xtt
-Default: GLcore, bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record,
speedo, type1, vbe, xtt
+Choices: GLcore, bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record,
speedo, type1, v4l, vbe, xtt
+Default: GLcore, bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record,
speedo, type1, v4l, vbe, xtt
_Description: Select the XFree86 server modules that should be loaded by
default.
It is possible to customize (or completely omit) the list of modules that the
X server loads by default. This option is for advanced users. In most
@@ -438,8 +438,8 @@
Template: xserver-xfree86/config/monitor/mode-list
Type: select
-Choices: 640x480 @ 60Hz, 640x480 @ 72Hz, 800x600 @ 60Hz, 800x600 @ 72Hz,
800x600 @ 85Hz, 1024x768 @ 60Hz, 1024x768 @ 70Hz, 1024x768 @ 75Hz, 1152x864 @
75Hz, 1280x960 @ 60Hz, 1280x960 @ 85Hz, 1280x1024 @ 60Hz, 1600x1200 @ 60Hz,
1600x1200 @ 75Hz, 1600x1200 @ 85Hz, 1792x1344 @ 60Hz, 1792x1344 @ 75Hz,
1856x1392 @ 60Hz, 1856x1392 @ 75Hz, 1920x1440 @ 60Hz, 1920x1440 @ 75Hz
-Default: 1280x960 @ 60Hz
+Choices: 640x480 @ 60Hz, 640x480 @ 72Hz, 800x600 @ 60Hz, 800x600 @ 72Hz,
800x600 @ 85Hz, 832x624 @ 75Hz, 1024x768 @ 60Hz, 1024x768 @ 70Hz, 1024x768 @
75Hz, 1152x768 @ 54.8Hz, 1152x864 @ 75Hz, 1280x960 @ 60Hz, 1280x960 @ 85Hz,
1280x1024 @ 60Hz, 1400x1050 @ 60Hz, 1400x1050 @ 75Hz, 1600x1024 @ 60Hz,
1600x1200 @ 60Hz, 1600x1200 @ 75Hz, 1600x1200 @ 85Hz, 1792x1344 @ 60Hz,
1792x1344 @ 75Hz, 1856x1392 @ 60Hz, 1856x1392 @ 75Hz, 1920x1440 @ 60Hz,
1920x1440 @ 75Hz, 1920x1440 @ 85Hz, 2048x1536 @ 60Hz, 2048x1536 @ 75Hz,
2048x1536 @ 85Hz
+Default: 1024x768 @ 60Hz
_Description: Please select your monitor's best video mode.
Choose the "best" resolution and refresh rate you believe your monitor
capable of. Larger resolutions and refresh rates are better. If you use a
