X Strike Force X.Org X11 SVN commit: r286 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-06-27 22:42:56 -0500 (Mon, 27 Jun 2005)
New Revision: 286
Added:
trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
trunk/debian/patches/099s_xkb_tr_fix_eacute.diff
Removed:
trunk/debian/patches/099q_xkb_tr_fix_eacute.diff
Modified:
trunk/debian/TODO
trunk/debian/patches/099e_xorgconf_manpage_overhaul.diff
Log:
- Patch audit. Thanks to Julien Cristau!
- 099a_improve_search_for_libXcursor.diff -- present under same name
- 099b_Xft_FreeType_2.1.7_build_fix.diff -- upstream
- 099c_support_loadable_external_Xcursor_lib.diff -- present under same
name
- 099d_Imake.rules_fix_RawCppFileTarget.diff -- lost
- 099f_savage_driver_disable_randr_on_rotation.diff -- present under same
name
- 099g_xkb_symbols_polish_fix_keypad_separator.diff -- present under same
name
- 099i_pro_savage_ddr_set_use_bios_to_false.diff -- lost
- 099j_xkb_new_layouts.diff -- present under same name, except for
rules/xfree86:
+ Remove special case that causes PC keyboard models with the us_intl
layout to load the us layout and add the us_intl layout to it.
which is upstream in rules/xorg.
- 099k_Compose_fix_latin1_UTF8.diff -- present under same name
- 099l_neomagic_magic_poke_for_video_performance.diff -- upstream
- 099m_mga_increase_minimum_pixel_clock.diff -- modified patch present
under same name
- 099n_fbdev_driver_message_improvements.diff -- present under same name
- 099o_ati_radeon_fix_SEGV_in_display_query.diff -- probably unneeded
with new version of the driver
- 099p_xkb_brazilian_fix_keypad_separator.diff -- present under same name
- 099s_selinux_support.diff -- lost
- 099t_xkb_remove_hidden_attributes.diff -- lost
- 099u_mkdirhier_rewrite.diff -- lost
- 099v_fontserver_fix_SEGV.diff -- lost
- 099w_fix_XGetWProp_manpage.diff -- upstream
- 099x_xdm_support_logfile_rotation.diff -- lost
- 099e_XF86Config_manpage_overhaul.diff -- modified and included
- 099q_tdfx_improve_mode_rejection_diagnostics.diff -- ported patch
included as 099s
- 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff -- lost,
rediffed and included
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/TODO 2005-06-28 03:42:56 UTC (rev 286)
@@ -66,32 +66,16 @@
096_Xlib_l10n_pt_BR.UTF-8.diff
097_mouse_zaxis_mapping_pushes_up_buttons.diff
098_en_US.UTF-8_Compose_fix_Unicode_plane_1.diff
-099a_improve_search_for_libXcursor.diff
-099b_Xft_FreeType_2.1.7_build_fix.diff
-099c_support_loadable_external_Xcursor_lib.diff
-099d_Imake.rules_fix_RawCppFileTarget.diff
-099e_XF86Config_manpage_overhaul.diff
-099f_savage_driver_disable_randr_on_rotation.diff
-099g_xkb_symbols_polish_fix_keypad_separator.diff
-099h_mesa_tdfx_load_right_glide_library.diff
-099i_pro_savage_ddr_set_use_bios_to_false.diff
-099j_xkb_new_layouts.diff
-099k_Compose_fix_latin1_UTF8.diff
-099l_neomagic_magic_poke_for_video_performance.diff
-099m_mga_increase_minimum_pixel_clock.diff
-099n_fbdev_driver_message_improvements.diff
-099o_ati_radeon_fix_SEGV_in_display_query.diff
-099p_xkb_brazilian_fix_keypad_separator.diff
-099q_tdfx_improve_mode_rejection_diagnostics.diff
-099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
-099s_selinux_support.diff
-099t_xkb_remove_hidden_attributes.diff
-099u_mkdirhier_rewrite.diff
-099v_fontserver_fix_SEGV.diff
-099w_fix_XGetWProp_manpage.diff
-099x_xdm_support_logfile_rotation.diff
+099h_mesa_tdfx_load_right_glide_library.diff
+ -- second hunk changed. I don't know which one is right.
099z_xkb_fix_rules_xfree86.diff
+ -- don't know yet, someone needs to check against new patch 099y.
099z_xkb_level3_ralt_switch.diff
+ -- present under same name, but without changes to: (Why?)
+ xc/programs/xkbcomp/symbols/pc/dvorak
+ xc/programs/xkbcomp/symbols/pc/pl
+ xc/programs/xkbcomp/symbols/pc/pl2
+
304_arm_Xlib.h_kludge_around_ARM_ABI_brain_damage.diff - needs to be ported
913_debian_remove_code_ref_to_object_code_files.diff - needs validation
* patch to xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c lost
Modified: trunk/debian/patches/099e_xorgconf_manpage_overhaul.diff
===================================================================
--- trunk/debian/patches/099e_xorgconf_manpage_overhaul.diff 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/patches/099e_xorgconf_manpage_overhaul.diff 2005-06-28 03:42:56 UTC (rev 286)
@@ -12,23 +12,25 @@
NOTE: Branden you must really love this package!
diff -ruN xc-old/programs/Xserver/hw/xfree86/xorg.conf.man xc/programs/Xserver/hw/xfree86/xorg.conf.man
---- xc-old/programs/Xserver/hw/xfree86/xorg.conf.man 2004-10-21 07:02:51.167313000 +0000
-+++ xc/programs/Xserver/hw/xfree86/xorg.conf.man 2004-10-21 09:15:22.460533272 +0000
+--- xc-old/programs/Xserver/hw/xfree86/xorg.conf.man 2005-06-27 20:10:28.695753308 +0200
++++ xc/programs/Xserver/hw/xfree86/xorg.conf.man 2005-06-27 20:07:36.515966951 +0200
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
.SH NAME
-__xconfigfile__ - Configuration File for __xservername__
-+__xconfigfile__ \- Configuration File for __xservername__
++__xconfigfile__ \- configuration File for __xservername__ X server
.SH INTRODUCTION
.B __xservername__
supports several mechanisms for supplying/obtaining configuration and
-@@ -22,8 +22,9 @@
+@@ -21,9 +21,10 @@
+ .SH DESCRIPTION
.B __xservername__
uses a configuration file called
- .B __xconfigfile__
+-.B __xconfigfile__
-for its initial setup. This configuration file is searched for in the
-following places when the server is started as a normal user:
++.I __xconfigfile__
+for its initial setup.
+This configuration file is searched for in the following places when the
+server is started as a normal user:
@@ -92,7 +94,7 @@
.I __projectroot__/lib/X11/__xconfigfile__
.fi
.RE
-@@ -90,7 +92,8 @@
+@@ -90,13 +92,13 @@
is the path specified by that environment variable (usually the home
directory), and
.I <hostname>
@@ -101,8 +103,17 @@
+.BR gethostname (__oslibmansuffix__).
.PP
The
- .B __xconfigfile__
-@@ -121,13 +124,14 @@
+-.B __xconfigfile__
+-file is composed of a number of sections which may be present in any
+-order. Each section has
+-the form:
++.I __xconfigfile__
++file is composed of a number of sections which may be present in any order.
++Each section has the form:
+ .PP
+ .RS 4
+ .nf
+@@ -121,13 +123,14 @@
.BR "Modes " "Video modes descriptions"
.BR "Screen " "Screen configuration"
.BR "ServerLayout " "Overall layout"
@@ -120,7 +131,7 @@
.B InputDevice
section should be used instead.
.PP
-@@ -144,35 +148,39 @@
+@@ -144,35 +147,39 @@
.PP
The
.B ServerLayout
@@ -157,7 +168,7 @@
.PP
-Config file keywords are case-insensitive, and "_" characters are
-ignored. Most strings (including
-+Config file keywords are case-insensitive, and \(lq_\(rq characters are
++Config file keywords are case\-insensitive, and \(lq_\(rq characters are
+ignored.
+Most strings (including
.B Option
@@ -177,7 +188,7 @@
.PP
.RS 4
.nf
-@@ -182,17 +190,18 @@
+@@ -182,17 +189,18 @@
.fi
.RE
.PP
@@ -202,7 +213,7 @@
.PP
.RS 4
.nf
-@@ -209,8 +218,8 @@
+@@ -209,8 +217,8 @@
.B Option
values, not just strings, must be enclosed in quotes.
.PP
@@ -213,7 +224,7 @@
.BR TRUE .
The following boolean option values are recognised as
.BR TRUE :
-@@ -263,27 +272,32 @@
+@@ -263,30 +271,35 @@
the value and the expectations of the appropriate range of the value.
It is recommended that the units always be specified when using frequency
option values to avoid any errors in determining the value.
@@ -226,9 +237,9 @@
-and __xservername__(__appmansuffix__)). The command line settings override the values specified
-in the config file. The
+Some of these paths can also be set from the command line (see
-+.BR Xserver(__appmansuffix__)
++.BR Xserver (__appmansuffix__)
+and
-+.BR __xservername__(__appmansuffix__)).
++.BR __xservername__ (__appmansuffix__)).
+The command line settings override the values specified in the config
+file.
+The
@@ -253,8 +264,12 @@
+Font server identifiers have the form:
.PP
.RS 11
- .IR <trans> / <hostname> : <port-number>
-@@ -294,16 +308,16 @@
+-.IR <trans> / <hostname> : <port-number>
++.IR <trans> / <hostname> : <port\-number>
+ .RE
+ .PP
+ .RS 7
+@@ -294,16 +307,16 @@
.I <trans>
is the transport type to use to connect to the font server (e.g.,
.B unix
@@ -274,7 +289,7 @@
font path elements:
.PP
.RS 4
-@@ -340,7 +354,7 @@
+@@ -340,7 +353,7 @@
.BI "RGBPath \*q" path \*q
sets the path name for the RGB color database.
When this entry is not specified in the config file, the server falls back
@@ -283,7 +298,7 @@
.PP
.RS 11
.I __projectroot__/lib/X11/rgb
-@@ -352,9 +366,10 @@
+@@ -352,9 +365,10 @@
binary format RGB color databases.
.TP 7
.BI "ModulePath \*q" path \*q
@@ -297,7 +312,7 @@
.B ModulePath
entries may be specified, and they will be concatenated to build the
module search path used by the server.
-@@ -362,8 +377,8 @@
+@@ -362,8 +376,8 @@
.ig
.TP 7
.BI "LogFile \*q" path \*q
@@ -308,7 +323,7 @@
.PP
.RS 11
.RI __logdir__/__xservername__. <n> .log
-@@ -374,15 +389,18 @@
+@@ -374,15 +388,18 @@
.I <n>
is the display number for the __xservername__ server.
..
@@ -331,24 +346,24 @@
.B ServerFlags
section is optional, as are the entries that may be specified in it.
.PP
-@@ -394,11 +412,13 @@
+@@ -394,11 +411,12 @@
.B Options
specified in the active
.B ServerLayout
-section. Options with command line equivalents are overridden when their
-command line equivalent is used. The options recognised by this section
+-are:
+section.
+Options with command line equivalents are overridden when their command
+line equivalent is used.
-+The options recognised by this section
- are:
++The options recognised by this section are:
.TP 7
-.BI "Option \*qDefaultServerLayout\*q \*q" layout-id \*q
+.BI "Option \*qDefaultServerLayout\*q \*q" layout\-id \*q
This specifies the default
.B ServerLayout
section to use in the absence of the
-@@ -406,148 +426,185 @@
+@@ -406,148 +424,185 @@
command line option.
.TP 7
.BI "Option \*qNoTrapSignals\*q \*q" boolean \*q
@@ -378,8 +393,8 @@
+refers to one of the numbered function keys).
+That sequence is normally used to switch to another \*qvirtual terminal\*q
+on operating systems that have this feature.
-+When this option is enabled, that key sequence has no special meaning
-+and is passed to clients.
++When this option is enabled, that key sequence has no special meaning and
++is passed to clients.
+Default: off.
.TP 7
.BI "Option \*qDontZap\*q \*q" boolean \*q
@@ -496,7 +511,7 @@
.TP 7
.BI "Option \*qPciForceConfig1\*q"
-Force the use PCI config type 1. Default: not set.
-+Force the use PCI config type 1.
++Force the use PCI config type 1.
+Default: not set.
.TP 7
.BI "Option \*qPciForceConfig2\*q"
@@ -552,7 +567,7 @@
-enabled for screens that have the
+is in minutes, and the value can be changed at run\-time with
+.BR xset(__appmansuffix__).
-+Default: 30 minutes.
++Default: 30 minutes.
+This is only suitable for VESA DPMS compatible monitors, and may not be
+supported by all video drivers.
+It is only enabled for screens that have the
@@ -601,7 +616,7 @@
.\" Doubt this should be documented.
.ig
.TP 7
-@@ -557,66 +614,73 @@
+@@ -557,66 +612,73 @@
..
.TP 7
.BI "Option \*qNoPM\*q \*q" boolean \*q
@@ -699,7 +714,7 @@
.B Load
keyword, as described here:
.TP 7
-@@ -624,8 +688,9 @@
+@@ -624,8 +686,9 @@
This instructs the server to load the module called
.IR modulename .
The module name given should be the module's standard name, not the
@@ -711,7 +726,7 @@
.PP
.RS 7
Example: the Type 1 font rasteriser can be loaded with the following entry:
-@@ -644,13 +709,13 @@
+@@ -644,13 +707,13 @@
that are passed to the module when it is loaded.
.PP
Example: the extmod module (which contains a miscellaneous group of
@@ -727,7 +742,7 @@
.B EndSubSection
.fi
.RE
-@@ -672,17 +737,20 @@
+@@ -672,17 +735,20 @@
.fi
.RE
.PP
@@ -739,7 +754,7 @@
+The \(lqbitmap\(rq font module is loaded automatically.
+It is recommended
+that at very least the \(lqextmod\(rq extension module be loaded.
-+If it isn't some commonly used server extensions (like the SHAPE
++If it isn't, some commonly used server extensions (like the SHAPE
+extension) will not be available.
+.SH "INPUTDEVICE SECTION"
The config file may have multiple
@@ -757,7 +772,7 @@
.PP
.B InputDevice
sections have the following format:
-@@ -704,18 +772,21 @@
+@@ -704,18 +770,21 @@
.B Driver
entries are required in all
.B InputDevice
@@ -782,7 +797,7 @@
.B InputDevice
section is considered active if it is referenced by an active
.B ServerLayout
-@@ -725,7 +796,10 @@
+@@ -725,7 +794,10 @@
.B \-pointer
command line options, or if it is selected implicitly as the core pointer
or keyboard device in the absence of such explicit references.
@@ -794,7 +809,7 @@
.PP
In the absence of an explicitly specified core input device, the first
.B InputDevice
-@@ -733,21 +807,23 @@
+@@ -733,21 +805,24 @@
.B CorePointer
(or
.BR CoreKeyboard )
@@ -811,9 +826,11 @@
-sections recognise some driver-independent
+sections recognise some driver\-independent
.BR Options ,
- which are described here. See the individual input driver manual pages
+-which are described here. See the individual input driver manual pages
-for a description of the device-specific options.
-+for a description of the device\-specific options.
++which are described here.
++See the individual input driver manual pages for a description of the
++device\-specific options.
.TP 7
.BI "Option \*qCorePointer\*q"
When this is set, the input device is installed as the core (primary)
@@ -825,7 +842,7 @@
.B ServerLayout
section, or from the
.B \-pointer
-@@ -759,8 +835,9 @@
+@@ -759,8 +834,9 @@
.TP 7
.BI "Option \*qCoreKeyboard\*q"
When this is set, the input device is to be installed as the core
@@ -837,7 +854,7 @@
.B ServerLayout
section, or from the
.B \-keyboard
-@@ -774,19 +851,21 @@
+@@ -774,19 +850,21 @@
.TP 7
.BI "Option \*qSendCoreEvents\*q \*q" boolean \*q
Both of these options are equivalent, and when enabled cause the
@@ -865,7 +882,7 @@
.PP
.B Device
sections have the following format:
-@@ -812,7 +891,8 @@
+@@ -812,27 +890,30 @@
.PP
The
.B Identifier
@@ -875,7 +892,15 @@
.B Driver
entry specifies the name of the driver to use for this graphics device.
When using the loadable server, the driver module
-@@ -826,13 +906,14 @@
+ .RI \*q driver \*q
+ will be loaded for each active
+ .B Device
+-section. A
++section.
++A
+ .B Device
+ section is considered active if it is referenced by an active
+ .B Screen
section.
.PP
.B Device
@@ -922,7 +947,7 @@
+the primary graphics card.
+In multi\-head configurations, or when using a secondary graphics card in a
+single\-head configuration, this entry is mandatory.
-+Its main purpose is to make an unambiguous connection between the device
++Its main purpose is to make an unambiguous connection between the device
+section and the hardware it is representing.
+This information can usually be found by running the __xservername__ server with the
.B \-scanpci
@@ -952,8 +977,8 @@
-specify it unless the driver-specific documentation recommends that you
-do.
+board.
-+In most cases this entry is not required because the drivers will probe
-+the hardware to determine the chipset type.
++In most cases this entry is not required because the drivers will probe the
++hardware to determine the chipset type.
+Don't specify it unless the driver\-specific documentation recommends that
+you do.
.TP 7
@@ -967,7 +992,7 @@
+board.
+This is only used by a few of the drivers, and in most cases it is not
+required because the drivers will probe the hardware to determine the
-+RAMDAC type where possible.
++RAMDAC type where possible.
+Don't specify it unless the driver\-specific documentation recommends that
+you do.
.TP 7
@@ -984,15 +1009,15 @@
-defaults built in to driver, or when the driver can't auto-detect the
-correct defaults. Don't specify it unless the driver-specific
-documentation recommends that you do.
-+printed on the RAMDAC chip).
-+The speed is in MHz.
++printed on the RAMDAC chip).
++The speed is in MHz.
+When one value is given, it applies to all framebuffer pixel sizes.
-+When multiple values are give, they apply to the framebuffer pixel sizes
++When multiple values are given, they apply to the framebuffer pixel sizes
+8, 16, 24 and 32 respectively.
+This is not used by many drivers, and only needs to be specified when the
+speed rating of the RAMDAC is different from the defaults built in to
+driver, or when the driver can't auto\-detect the correct defaults.
-+Don't specify it unless the driver-specific documentation recommends that
++Don't specify it unless the driver\-specific documentation recommends that
+you do.
.TP 7
.BI "Clocks " "clock ..."
@@ -1003,7 +1028,7 @@
-graphics board. Multiple
+specifies the pixel that are on your graphics board.
+The clocks are in MHz, and may be specified as a floating point number.
-+The value is stored internally to the nearest kHz.
++The value is stored internally to the nearest kHz.
+The ordering of the clocks is important.
+It must match the order in which they are selected on the graphics board.
+Multiple
@@ -1038,15 +1063,16 @@
+on the graphics board.
+This is measured in kBytes.
+In most cases this is not required because the __xservername__ server probes the graphics
-+board to determine this quantity.
++board to determine this quantity.
+The driver\-specific documentation should indicate when it might be needed.
.TP 7
.BI "BiosBase " "baseaddress"
- This optional entry specifies the base address of the video BIOS for
+-This optional entry specifies the base address of the video BIOS for
-the VGA board. This address is normally auto-detected, and should only
-be specified if the driver-specific documentation recommends it.
-+the VGA board.
-+This address is normally auto-detected, and should only be specified if
++This optional entry specifies the base address of the video BIOS
++for the VGA board.
++This address is normally auto\-detected, and should only be specified if
+the driver\-specific documentation recommends it.
.TP 7
.BI "MemBase " "baseaddress"
@@ -1062,7 +1088,7 @@
-This optional entry specifies the IO base address. This entry is not
-used by many drivers, and it should only be specified if the
-driver-specific documentation recommends it.
-+This optional entry specifies the IO base address.
++This optional entry specifies the IO base address.
+This entry is not used by many drivers, and it should only be specified if
+the driver\-specific documentation recommends it.
.TP 7
@@ -1088,7 +1114,7 @@
-for the regular text mode. The frequency is specified in MHz. This is
-rarely used.
+for the regular text mode.
-+The frequency is specified in MHz.
++The frequency is specified in MHz.
+This is rarely used.
.ig
.TP 7
@@ -1109,7 +1135,7 @@
-.SH VIDEOADAPTOR SECTION
-Nobody wants to say how this works. Maybe nobody knows ...
+.SH "VIDEOADAPTOR SECTION"
-+Nobody wants to say how this works.
++Nobody wants to say how this works.
+Maybe nobody knows ...
-.SH MONITOR SECTION
@@ -1127,7 +1153,7 @@
The
.B Identifier
-entry specifies the unique name for this monitor. The
-+entry specifies the unique name for this monitor.
++entry specifies the unique name for this monitor.
+The
.B Monitor
section provides information about the specifications of the monitor,
@@ -1139,7 +1165,7 @@
-VESA standard modes. When modes are specified explicitly in the
+and information about the video modes to use with the monitor.
+Specifying video modes is optional because the server now has a built\-in
-+list of VESA standard modes.
++list of VESA standard modes.
+When modes are specified explicitly in the
.B Monitor
section (with the
@@ -1149,8 +1175,8 @@
.B UseModes
-keywords), built-in modes with the same names are not included. Built-in
-modes with different names are, however, still implicitly included.
-+keywords), built-in modes with the same names are not included.
-+Built-in modes with different names are, however, still implicitly
++keywords), built\-in modes with the same names are not included.
++Built\-in modes with different names are, however, still implicitly
+included.
.PP
The entries that may be used in
@@ -1196,7 +1222,7 @@
-values. A range of values is two values separated by a dash. By default
-the values are in units of Hz. They may be specified in MHz or kHz if
+values.
-+A range of values is two values separated by a dash.
++A range of values is two values separated by a dash.
+By default the values are in units of Hz.
+They may be specified in MHz or kHz if
.B MHz
@@ -1208,29 +1234,32 @@
-handbook. If this entry is omitted, a default range of 43-72Hz is used.
+is added to the end of the line.
+The data given here is used by the __xservername__ server to determine if video modes are
-+within the specifications of the monitor.
-+This information should be available in the monitor's handbook.
++within the specifications of the monitor.
++This information should be available in the monitor's handbook.
+If this entry is omitted, a default range of 43\-72Hz is used.
.TP 7
.BI "DisplaySize " "width height"
This optional entry gives the width and height, in millimetres, of the
-picture area of the monitor. If given this is used to calculate the
-horizontal and vertical pitch (DPI) of the screen.
-+picture area of the monitor.
-+If given this is used to calculate the horizontal and vertical pitch (DPI)
-+of the screen.
- .TP 7
+-.TP 7
-.BI "Gamma " "gamma-value"
-+.BI "Gamma " "gamma\-value"
- .TP 7
+-.TP 7
-.BI "Gamma " "red-gamma green-gamma blue-gamma"
-+.BI "Gamma " "red\-gamma green\-gamma blue\-gamma"
- This is an optional entry that can be used to specify the gamma correction
+-This is an optional entry that can be used to specify the gamma correction
-for the monitor. It may be specified as either a single value or as
-three separate RGB values. The values should be in the range 0.1 to
-10.0, and the default is 1.0. Not all drivers are capable of using this
-information.
-+for the monitor.
++picture area of the monitor.
++If given, this is used to calculate the horizontal and vertical pitch (DPI)
++of the screen.
++.TP 7
++.BI "Gamma " "gamma\-value"
++.TP 7
++.BI "Gamma " "red\-gamma green\-gamma blue\-gamma"
++This is an optional entry that can be used to specify the gamma
++correction for the monitor.
+It may be specified as either a single value or as three separate RGB
+values.
+The values should be in the range 0.1 to 10.0, and the default is 1.0.
@@ -1262,7 +1291,7 @@
The mode description is terminated with the
.B EndMode
-keyword. The mode description consists of the following entries:
-+keyword.
++keyword.
+The mode description consists of the following entries:
.RS 7
.TP 4
@@ -1279,11 +1308,11 @@
-on a scan line appear on the left of the screen, this value should be
-decreased.
+specifies the number of pixels (towards the right edge of the screen) by
-+which the display enable signal is to be skewed.
-+Not all drivers use this information.
++which the display enable signal is to be skewed.
++Not all drivers use this information.
+This option might become necessary to override the default value supplied
-+by the server (if any).
-+\(lqRoving\(rq horizontal lines indicate this value needs to be increased.
++by the server (if any).
++\(lqRoving\(rq horizontal lines indicate this value needs to be increased.
+If the last few pixels on a scan line appear on the left of the screen,
+this value should be decreased.
.TP 4
@@ -1291,7 +1320,7 @@
specifies the number of times each scanline is painted on the screen.
-Not all drivers use this information. Values less than 1 are treated
-as 1, which is the default. Generally, the
-+Not all drivers use this information.
++Not all drivers use this information.
+Values less than 1 are treated as 1, which is the default.
+Generally, the
.B \*qDoubleScan\*q
@@ -1320,7 +1349,7 @@
-numbers specifying the horizontal timings. These numbers are the
+.I mode\-description
+is in four sections, the first three of which are mandatory.
-+The first is the dot (pixel) clock.
++The first is the dot (pixel) clock.
+This is a single number specifying the pixel clock rate for the mode in
+MHz.
+The second section is a list of four numbers specifying the horizontal
@@ -1334,8 +1363,8 @@
-values. The third section is a list of four numbers specifying the
-vertical timings. These numbers are the
+values.
-+The third section is a list of four numbers specifying the vertical
-+timings.
++The third section is a list of four numbers specifying the vertical
++timings.
+These numbers are the
.IR vdisp ,
.IR vsyncstart ,
@@ -1370,7 +1399,7 @@
.B Modes
-sections, or none. These sections provide a way of defining sets of
-video modes independently of the
-+sections, or none.
++sections, or none.
+These sections provide a way of defining sets of video modes independently
+of the
.B Monitor
@@ -1398,7 +1427,7 @@
.B Screen
-sections. There must be at least one, for the "screen" being used.
-A "screen" represents the binding of a graphics device
-+sections.
++sections.
+There must be at least one, for the \(lqscreen\(rq being used.
+A \(lqscreen\(rq represents the binding of a graphics device
.RB ( Device
@@ -1419,18 +1448,18 @@
.B Screen
section found in the config file is considered the active one.
.PP
-@@ -1288,88 +1412,97 @@
+@@ -1288,94 +1412,104 @@
.B Identifier
and
.B Device
-entries are mandatory. All others are optional.
-+entries are mandatory.
++entries are mandatory.
+All others are optional.
.PP
The
.B Identifier
-entry specifies the unique name for this screen. The
-+entry specifies the unique name for this screen.
++entry specifies the unique name for this screen.
+The
.B Screen
section provides information specific to the whole screen, including
@@ -1498,7 +1527,7 @@
-there is even a choice in this value is for depth 24, where some hardware
-supports both a packed 24 bit framebuffer layout and a sparse 32 bit
-framebuffer layout.
-+command line option can be used to override this.
++command line option can be used to override this.
+In most cases the driver will chose the best default value for this.
+The only case where there is even a choice in this value is for depth 24,
+where some hardware supports both a packed 24 bit framebuffer layout and a
@@ -1512,7 +1541,7 @@
-section. Some are driver-specific and are described in the driver
-documentation. Others are driver-independent, and will eventually be
-described here.
-+section.
++section.
+Some are driver\-specific and are described in the driver documentation.
+Others are driver\-independent, and will eventually be described here.
.\" XXX These should really be in an xaa man page.
@@ -1526,11 +1555,11 @@
-accelerated operations, listed below. Note that disabling an operation
-will have no effect if the operation is not accelerated (whether due to
-lack of support in the hardware or in the driver).
-+cards' 2D hardware acceleration available to the __xservername__ server.
++cards' 2D hardware acceleration available to the __xservername__ server.
+This option is on by default, but it may be necessary to turn it off if
+there are bugs in the driver.
-+There are many options to disable specific accelerated operations, listed
-+below.
++There are many options to disable specific accelerated operations, listed
++below.
+Note that disabling an operation will have no effect if the operation is
+not accelerated (whether due to lack of support in the hardware or in the
+driver).
@@ -1540,7 +1569,7 @@
of another card for posting or the legacy V_BIOS range located at 0xc0000
-or an alternative address (BUS_ISA). This is only useful under very
-special circumstances and should be used with extreme care.
-+or an alternative address (BUS_ISA).
++or an alternative address (BUS_ISA).
+This is only useful under very special circumstances and should be used with
+extreme care.
.TP 7
@@ -1552,8 +1581,16 @@
primary card has already been initialized by the BIOS at boot time.
Default: false.
.TP 7
-@@ -1385,14 +1518,14 @@
+ .BI "Option \*qNoInt10\*q \*q" boolean \*q
+ Disables the Int10 module, a module that uses the int10 call to the BIOS
+-of the graphics card to initialize it. Default: false.
++of the graphics card to initialize it.
++Default: false.
.TP 7
+ .BI "Option \*qNoMTRR\*q"
+ Disables MTRR (Memory Type Range Register) support, a feature of modern
+@@ -1385,14 +1519,14 @@
+ .TP 7
.BI "Option \*qXaaNoCPUToScreenColorExpandFill\*q"
Disables accelerated rectangular expansion blits from source patterns
-stored in system memory (using a memory-mapped aperture).
@@ -1570,7 +1607,7 @@
pattern.
.TP 7
.BI "Option \*qXaaNoDashedBresenhamLine\*q"
-@@ -1402,8 +1535,8 @@
+@@ -1402,8 +1536,8 @@
Disables accelerated dashed line draws between two arbitrary points.
.TP 7
.BI "Option \*qXaaNoImageWriteRect\*q"
@@ -1581,7 +1618,7 @@
.TP 7
.BI "Option \*qXaaNoMono8x8PatternFillRect\*q"
Disables accelerated fills of a rectangular region with a monochrome
-@@ -1424,7 +1557,7 @@
+@@ -1424,7 +1558,7 @@
stored in system memory (one scan line at a time).
.TP 7
.BI "Option \*qXaaNoScanlineImageWriteRect\*q"
@@ -1590,7 +1627,7 @@
system memory to video memory (one scan line at a time).
.TP 7
.BI "Option \*qXaaNoScreenToScreenColorExpandFill\*q"
-@@ -1439,10 +1572,10 @@
+@@ -1439,10 +1573,10 @@
Disables accelerated solid Bresenham line draws.
.TP 7
.BI "Option \*qXaaNoSolidFillRect\*q"
@@ -1603,7 +1640,7 @@
.TP 7
.BI "Option \*qXaaNoSolidHorVertLine\*q"
Disables accelerated solid horizontal and vertical line draws.
-@@ -1454,27 +1587,30 @@
+@@ -1454,27 +1588,30 @@
.B Screen
section may optionally contain one or more
.B Display
@@ -1624,52 +1661,57 @@
.B Screen
section may have multiple
.B Display
- subsections.
+-subsections.
-The "active"
++subsections.
+The \(lqactive\(rq
.B Display
subsection is the first that matches the depth and/or fbbpp values being
used, or failing that, the first that has neither a depth or fbbpp value
-specified. The
-+specified.
++specified.
+The
.B Display
-subsections are optional. When there isn't one that matches the depth
-and/or fbbpp values being used, all the parameters that can be specified
-here fall back to their defaults.
-+subsections are optional
-+. When there isn't one that matches the depth and/or fbbpp values being used,
++subsections are optional.
++When there isn't one that matches the depth and/or fbbpp values being used,
+all the parameters that can be specified here fall back to their defaults.
.PP
.B Display
subsections have the following format:
-@@ -1493,36 +1629,41 @@
+@@ -1488,78 +1625,88 @@
+ .B " EndSubSection"
+ .fi
+ .RE
+-.PP
+ .TP 7
.BI "Depth " depth
This entry specifies what colour depth the
.B Display
-subsection is to be used for. This entry is usually specified,
-but it may be omitted to create a match-all
-+subsection is to be used for.
++subsection is to be used for.
+This entry is usually specified, but it may be omitted to create a match\-all
.B Display
subsection or when wishing to match only against the
.B FbBpp
-parameter. The range of
-+parameter.
++parameter.
+The range of
.I depth
-values that are allowed depends on the driver. Most driver support
-8, 15, 16 and 24. Some also support 1 and/or 4, and some may support
-other values (like 30). Note:
+values that are allowed depends on the driver.
-+Most driver support 8, 15, 16 and 24.
++Most drivers support 8, 15, 16 and 24.
+Some also support 1 and/or 4, and some may support other values (like 30).
+Note:
.I depth
--means the number of bits in a pixel that are actually used to determine
+ means the number of bits in a pixel that are actually used to determine
-the pixel colour. 32 is not a valid
-+means the number of bits in a pixel that are actually used to determine the
-+pixel colour.
++the pixel colour.
+32 is not a valid
.I depth
-value. Most hardware that uses 32 bits per pixel only uses 24 of them
@@ -1700,9 +1742,11 @@
+formats.
+This may also be specified from the command line with the
.B \-weight
- option (see __xservername__(__appmansuffix__)).
+-option (see __xservername__(__appmansuffix__)).
++option (see
++.BR __xservername__(__appmansuffix__)).
.TP 7
-@@ -1530,36 +1671,41 @@
+ .BI "Virtual " "xdim ydim"
This optional entry specifies the virtual screen resolution to be used.
.I xdim
must be a multiple of either 8 or 16 for most drivers, and a multiple
@@ -1712,9 +1756,9 @@
-the virtual screen resolution will be set to accommodate all the valid
-video modes given in the
+of 32 when running in monochrome mode.
-+The given value will be rounded down if this is not the case.
++The given value will be rounded down if this is not the case.
+Video modes which are too large for the specified virtual size will be
-+rejected.
++rejected.
+If this entry is not present, the virtual screen resolution will be set to
+accommodate all the valid video modes given in the
.B Modes
@@ -1737,11 +1781,11 @@
-specified must be in double quotes. They must correspond to those
-specified or referenced in the appropriate
+from the resolution of the initial video mode.
-+If this entry is not given, then the initial display will be centered in
++If this entry is not given, then the initial display will be centered in
+the virtual display area.
+.TP 7
+.BI "Modes \*q" mode\-name \*q " ..."
-+This optional entry specifies the list of video modes to use.
++This optional entry specifies the list of video modes to use.
+Each
+.I mode\-name
+specified must be in double quotes.
@@ -1754,7 +1798,7 @@
-display mode for startup. The list of valid modes is converted internally
-into a circular list. It is possible to switch to the next mode with
-.B Ctrl+Alt+Keypad-Plus
-+requirements.
++requirements.
+The first valid mode in this list will be the default display mode for
+startup.
+The list of valid modes is converted internally into a circular list.
@@ -1766,7 +1810,7 @@
When this entry is omitted, the valid modes referenced by the appropriate
.B Monitor
section will be used. If the
-@@ -1567,10 +1713,12 @@
+@@ -1567,10 +1714,12 @@
section contains no modes, then the selection will be taken from the
built-in VESA standard modes.
.TP 7
@@ -1783,7 +1827,7 @@
.BR PseudoColor ):
.PP
.RS 11
-@@ -1616,43 +1764,48 @@
+@@ -1616,43 +1765,48 @@
.RE
.TP 7
.BI "Black " "red green blue"
@@ -1807,8 +1851,8 @@
-driver-independent options. The former are described in the
-driver-specific documentation. Some of the latter are described above
-in the section about the
-+subsections.
-+These may include driver\-specific options and driver\-independent options.
++subsections.
++These may include driver\-specific options and driver\-independent options.
+The former are described in the driver\-specific documentation.
+Some of the latter are described above in the section about the
.B Screen
@@ -1819,7 +1863,7 @@
.B ServerLayout
-sections.
-A "server layout" represents the binding of one or more screens
-+sections.
++sections.
+A \(lqserver layout\(rq represents the binding of one or more screens
.RB ( Screen
sections) and one or more input devices
@@ -1849,7 +1893,7 @@
.B ServerLayout
sections are present, the single active screen and two active (core)
input devices are selected as described in the relevant sections above.
-@@ -1664,9 +1817,9 @@
+@@ -1664,9 +1818,9 @@
.nf
.B "Section \*qServerLayout\*q"
.BI " Identifier \*q" name \*q
@@ -1861,7 +1905,7 @@
.I " ..."
.I " options"
.I " ..."
-@@ -1684,10 +1837,11 @@
+@@ -1684,10 +1838,11 @@
.PP
The
.B Identifier
@@ -1875,12 +1919,12 @@
.BR Options .
In addition to options specific to this section (described below), the
.B ServerFlags
-@@ -1698,21 +1852,25 @@
+@@ -1698,21 +1853,25 @@
.PP
The entries that may be used in this section are described here.
.TP 7
-.BI "Screen " "screen-num" " \*qscreen-id\*q " "position-information"
-+.BI "Screen " "screen-num" " \*qscreen\-id\*q " "position\-information"
++.BI "Screen " "screen\-num" " \*qscreen\-id\*q " "position\-information"
One of these entries must be given for each screen being used in
-a session. The
-.I screen-id
@@ -1901,24 +1945,24 @@
-.I position-information
-field describes the way multiple screens are positioned. There are
-a number of different ways that this information can be provided:
-+in multi\-head configurations.
-+When this field is omitted, the screens will be numbered in the order
-+that they are listed in.
-+The numbering starts from 0, and must be consecutive.
++in multi\-head configurations.
++When this field is omitted, the screens will be numbered in the order that
++they are listed in.
++The numbering starts from 0, and must be consecutive.
+The
-+.I position-\information
++.I position\-information
+field describes the way multiple screens are positioned.
+There are a number of different ways that this information can be provided:
.RS 7
.TP 4
.I "x y"
-@@ -1722,48 +1880,53 @@
+@@ -1722,48 +1881,53 @@
.RI ( x , y ).
The
.B Absolute
-keyword is optional. Some older versions of __xservername__ (4.2 and earlier) don't
-recognise the
-+keyword is optional.
++keyword is optional.
+Some older versions of __xservername__ (4.2 and earlier) don't recognise the
.B Absolute
keyword, so it's safest to just specify the coordinates without it.
@@ -1957,7 +2001,7 @@
One of these entries should be given for each input device being used in
-a session. Normally at least two are required, one each for the core
-pointer and keyboard devices. If either of those is missing, suitable
-+a session.
++a session.
+Normally at least two are required, one each for the core pointer and
+keyboard devices.
+If either of those is missing, suitable
@@ -1975,18 +2019,18 @@
.I option
-fields may be specified, each in double quotes. The options permitted
-here are any that may also be given in the
-+fields may be specified, each in double quotes.
++fields may be specified, each in double quotes.
+The options permitted here are any that may also be given in the
.B InputDevice
-sections. Normally only session-specific input device options would be
-used here. The most commonly used options are:
-+sections.
++sections.
+Normally only session\-specific input device options would be used here.
+The most commonly used options are:
.PP
.RS 11
.nf
-@@ -1781,8 +1944,9 @@
+@@ -1781,8 +1945,9 @@
.B Options
In addition to the following, any option permitted in the
.B ServerFlags
@@ -1998,7 +2042,7 @@
.B ServerFlags
section.
.TP 7
-@@ -1795,9 +1959,11 @@
+@@ -1795,9 +1960,11 @@
.BR "DEVICE SECTION" ,
above) for the format of the
.I bus\-id
@@ -2012,7 +2056,7 @@
.TP 7
.BI "Option \*qSingleCard\*q \*q" boolean \*q
As
-@@ -1821,69 +1987,103 @@
+@@ -1821,69 +1988,101 @@
.B "EndSection"
.fi
.RE
@@ -2039,16 +2083,16 @@
entry and multiple
.B Option
-flags. The data therein is not used in this release.
-+flags.
+-.PP
++flags.
+The data therein is not used in this release.
- .PP
.SH FILES
-For an example of an __xconfigfile__ file, see the file installed as
+For an example of an
+.I __xconfigfile__
+file, see the file installed as
__projectroot__/lib/X11/__xconfigfile__.eg.
- .fi
+-.fi
.SH "SEE ALSO"
-X(__miscmansuffix__),
-Xserver(__appmansuffix__),
@@ -2091,49 +2135,49 @@
-vga(__drivermansuffix__),
-vmware(__drivermansuffix__),
+General:
-+.BR X(__miscmansuffix__),
-+.BR Xserver(__appmansuffix__),
-+.BR __xservername__(__appmansuffix__).
++.BR X (__miscmansuffix__),
++.BR Xserver (__appmansuffix__),
++.BR __xservername__ (__appmansuffix__).
+.PP
+.B Not all modules or interfaces are available on all platforms.
+.PP
+Display drivers:
-+.BR apm(__drivermansuffix__),
-+.BR .\" .IR ati(__drivermansuffix__),
-+.BR chips(__drivermansuffix__),
-+.BR cirrus(__drivermansuffix__),
-+.BR cyrix(__drivermansuffix__),
-+.BR fbdev(__drivermansuffix__),
-+.BR glide(__drivermansuffix__),
-+.BR glint(__drivermansuffix__),
-+.BR i128(__drivermansuffix__),
-+.BR i740(__drivermansuffix__),
-+.BR i810(__drivermansuffix__),
-+.BR imstt(__drivermansuffix__),
-+.BR mga(__drivermansuffix__),
-+.BR neomagic(__drivermansuffix__),
-+.BR nv(__drivermansuffix__),
-+.BR r128(__drivermansuffix__),
-+.BR rendition(__drivermansuffix__),
-+.BR savage(__drivermansuffix__),
-+.BR s3virge(__drivermansuffix__),
-+.BR siliconmotion(__drivermansuffix__),
-+.BR sis(__drivermansuffix__),
-+.BR sunbw2(__drivermansuffix__),
-+.BR suncg14(__drivermansuffix__),
-+.BR suncg3(__drivermansuffix__),
-+.BR suncg6(__drivermansuffix__),
-+.BR sunffb(__drivermansuffix__),
-+.BR sunleo(__drivermansuffix__),
-+.BR suntcx(__drivermansuffix__),
-+.BR tdfx(__drivermansuffix__),
-+.BR tga(__drivermansuffix__),
-+.BR trident(__drivermansuffix__),
-+.BR tseng(__drivermansuffix__),
-+.BR vesa(__drivermansuffix__),
-+.BR vga(__drivermansuffix__),
-+.BR via(__drivermansuffix__),
-+.BR vmware(__drivermansuffix__).
++.BR apm (__drivermansuffix__),
++.\" .BR ati (__drivermansuffix__),
++.BR chips (__drivermansuffix__),
++.BR cirrus (__drivermansuffix__),
++.BR cyrix (__drivermansuffix__),
++.BR fbdev (__drivermansuffix__),
++.BR glide (__drivermansuffix__),
++.BR glint (__drivermansuffix__),
++.BR i128 (__drivermansuffix__),
++.BR i740 (__drivermansuffix__),
++.BR i810 (__drivermansuffix__),
++.BR imstt (__drivermansuffix__),
++.BR mga (__drivermansuffix__),
++.BR neomagic (__drivermansuffix__),
++.BR nv (__drivermansuffix__),
++.BR r128 (__drivermansuffix__),
++.BR rendition (__drivermansuffix__),
++.BR savage (__drivermansuffix__),
++.BR s3virge (__drivermansuffix__),
++.BR siliconmotion (__drivermansuffix__),
++.BR sis (__drivermansuffix__),
++.BR sunbw2 (__drivermansuffix__),
++.BR suncg14 (__drivermansuffix__),
++.BR suncg3 (__drivermansuffix__),
++.BR suncg6 (__drivermansuffix__),
++.BR sunffb (__drivermansuffix__),
++.BR sunleo (__drivermansuffix__),
++.BR suntcx (__drivermansuffix__),
++.BR tdfx (__drivermansuffix__),
++.BR tga (__drivermansuffix__),
++.BR trident (__drivermansuffix__),
++.BR tseng (__drivermansuffix__),
++.BR vesa (__drivermansuffix__),
++.BR vga (__drivermansuffix__),
++.BR via (__drivermansuffix__),
++.BR vmware (__drivermansuffix__).
+.PP
+Input drivers:
+.\" .BR acecad (__drivermansuffix__),
Added: trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff
===================================================================
--- trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/patches/099q_tdfx_improve_mode_rejection_diagnostics.diff 2005-06-28 03:42:56 UTC (rev 286)
@@ -0,0 +1,52 @@
+$Id: 099q_tdfx_improve_mode_rejection_diagnostics.diff 2132 2005-01-12 07:11:51Z branden $
+
+The tdfx driver rejects modes without explaining why to the user. Fix this
+by logging the reason.
+
+This patch by Branden Robinson.
+
+Not submitted upstream to XFree86 or X.Org.
+
+Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+===================================================================
+--- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c (revision 285)
++++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c (working copy)
+@@ -2406,8 +2406,16 @@
+ TDFXPtr pTDFX;
+
+ TDFXTRACE("TDFXValidMode start\n");
+- if ((mode->HDisplay>2048) || (mode->VDisplay>1536))
++ if (mode->HDisplay>2048) {
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d"
++ " exceeding maximum of 2048\n", mode->HDisplay);
+ return MODE_BAD;
++ }
++ if (mode->VDisplay>1536) {
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with vertical resolution %d"
++ " exceeding maximum of 1536\n", mode->VDisplay);
++ return MODE_BAD;
++ }
+ /* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
+ pScrn = xf86Screens[scrnIndex];
+ pTDFX = TDFXPTR(pScrn);
+@@ -2421,13 +2429,19 @@
+ return MODE_OK;
+ break;
+ default:
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with unsupported"
++ " interlace flag\n");
+ return MODE_BAD;
+ break;
+ }
+ }
+ /* In clock doubled mode widths must be divisible by 16 instead of 8 */
+- if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16))
++ if ((mode->Clock>TDFX2XCUTOFF) && (mode->HDisplay%16)) {
++ xf86DrvMsg(scrnIndex, X_INFO, "rejecting mode with horizontal resolution %d"
++ " not divisibile by 16 and clock %d greater than %d\n",
++ mode->HDisplay, mode->Clock, TDFX2XCUTOFF);
+ return MODE_BAD;
++ }
+ return MODE_OK;
+ }
+
Deleted: trunk/debian/patches/099q_xkb_tr_fix_eacute.diff
===================================================================
--- trunk/debian/patches/099q_xkb_tr_fix_eacute.diff 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/patches/099q_xkb_tr_fix_eacute.diff 2005-06-28 03:42:56 UTC (rev 286)
@@ -1,13 +0,0 @@
-$Id$
-
---- xc/programs/xkbcomp/symbols/pc/tr.pre-bz-fix 2004-11-02 06:53:12.000000000 +1100
-+++ xc/programs/xkbcomp/symbols/pc/tr 2005-01-10 03:19:37.053962400 +1100
-@@ -46,7 +46,7 @@
- key <AC09> { [ l, L, VoidSymbol, VoidSymbol ] };
- key <AC10> { [ scedilla, Scedilla, acute, dead_acute ] };
- key <AC11> { [ i, Iabovedot, apostrophe, dead_caron ] };
-- key <TLDE> { [ quotedbl, backslash, plusminus, degree ] };
-+ key <TLDE> { [ quotedbl, eacute, plusminus, degree ] };
-
- key <BKSL> { [ comma, semicolon, grave, dead_grave ] };
- key <LSGT> { [ less, greater, bar, brokenbar ] };
Added: trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
===================================================================
--- trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 2005-06-28 03:42:56 UTC (rev 286)
@@ -0,0 +1,29 @@
+$Id: 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 2130 2005-01-11 07:26:36Z branden $
+
+This patch by Branden Robinson.
+
+General philosophy:
+
+The user should only be shown a usage messages when:
+ * it is asked for with a --help option or the like.
+ * the command line is syntactically invalid.
+
+Because xlsfonts's dsimple.c source file is also used in xprop, xwd, and
+xwininfo, this patch also corrects this behavior for those programs.
+
+Not submitted upstream to XFree86 or X.Org.
+
+Index: xc/programs/xlsfonts/dsimple.c
+===================================================================
+--- xc/programs/xlsfonts/dsimple.c (revision 285)
++++ xc/programs/xlsfonts/dsimple.c (working copy)
+@@ -188,8 +188,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit (1);
+ }
+
+ return(d);
Added: trunk/debian/patches/099s_xkb_tr_fix_eacute.diff
===================================================================
--- trunk/debian/patches/099s_xkb_tr_fix_eacute.diff 2005-06-27 03:53:13 UTC (rev 285)
+++ trunk/debian/patches/099s_xkb_tr_fix_eacute.diff 2005-06-28 03:42:56 UTC (rev 286)
@@ -0,0 +1,13 @@
+$Id: 099q_xkb_tr_fix_eacute.diff 189 2005-06-11 00:04:27Z branden $
+
+--- xc/programs/xkbcomp/symbols/pc/tr.pre-bz-fix 2004-11-02 06:53:12.000000000 +1100
++++ xc/programs/xkbcomp/symbols/pc/tr 2005-01-10 03:19:37.053962400 +1100
+@@ -46,7 +46,7 @@
+ key <AC09> { [ l, L, VoidSymbol, VoidSymbol ] };
+ key <AC10> { [ scedilla, Scedilla, acute, dead_acute ] };
+ key <AC11> { [ i, Iabovedot, apostrophe, dead_caron ] };
+- key <TLDE> { [ quotedbl, backslash, plusminus, degree ] };
++ key <TLDE> { [ quotedbl, eacute, plusminus, degree ] };
+
+ key <BKSL> { [ comma, semicolon, grave, dead_grave ] };
+ key <LSGT> { [ less, greater, bar, brokenbar ] };
Reply to: