xorg-server: Changes to 'debian-experimental'
debian/changelog | 14 +
debian/patches/05_module_defaults.diff | 264 +++++++++++++++++++++++
debian/patches/07_xorgconf_manpage_overhaul.diff | 68 ++---
debian/patches/34_xorg.conf_man_typos.patch | 6
debian/patches/series | 1
debian/xserver-xorg-core.NEWS | 18 +
6 files changed, 333 insertions(+), 38 deletions(-)
New commits:
commit c0532951497a0d2605ef5032deb42863c2e5b295
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Apr 14 14:25:32 2007 -0400
Add a debian/NEWS entry about the module defaults
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 708745f..1bb2865 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,3 +1,21 @@
+xorg-server (2:1.2.99.905-3) experimental; urgency=low
+
+ * This server update includes a patch to enable proper module defaults in
+ the server. A default set of modules will be loaded unless you
+ specifically specify that they don't load. You may do this in the module
+ section of your xorg.conf using the "Disable" instruction. Note that
+ this will only override the default, not an explicit "Load".
+
+ This change will not affect most users, however if you have a customized
+ xorg.conf in which you comment out "Load" lines to disable modules, you
+ will want to change those lines so that they are uncommented and say
+ "Disable" instead of "Load". The most notable example of this is the dri
+ module, which is now loaded by default. Those who experience crashes
+ when dri is enabled will want to make this change to ensure that their
+ system does not begin to crash again.
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 14 Apr 2007 12:41:37 -0400
+
xserver-xorg-core (1:1.0.2-5) unstable; urgency=low
* Several users have reported an error on load like the following:
commit 14bd42aade72560fd14e9758d7e4f393ba5ee7d9
Author: David Nusinow <dnusinow@debian.org>
Date: Sat Apr 14 12:44:23 2007 -0400
* Add 05_module_defaults.diff. This provides default modules loading
capabilities for the server that may be overrided easily. Previously the
server would load a set of default modules, but only if none were
specified in the xorg.conf, or if you didn't have a xorg.conf at all. This
patch provides a default set and you can add only the "Load" instructions
to xorg.conf that you want without losing the defaults. Similarly, if you
don't want to load a module that's loaded by default, you can add
"Disable modulename" to your xorg.conf (see man xorg.conf in this release
for details). See upstream bug #10541 for more.
diff --git a/debian/changelog b/debian/changelog
index 99bdb57..b338cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
xorg-server (2:1.2.99.905-3) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* xvfb now Recommends: xfonts-base (closes: #314598).
- -- Julien Cristau <jcristau@debian.org> Fri, 13 Apr 2007 17:44:10 +0200
+ [ David Nusinow ]
+ * Add 05_module_defaults.diff. This provides default modules loading
+ capabilities for the server that may be overrided easily. Previously the
+ server would load a set of default modules, but only if none were
+ specified in the xorg.conf, or if you didn't have a xorg.conf at all. This
+ patch provides a default set and you can add only the "Load" instructions
+ to xorg.conf that you want without losing the defaults. Similarly, if you
+ don't want to load a module that's loaded by default, you can add
+ "Disable modulename" to your xorg.conf (see man xorg.conf in this release
+ for details). See upstream bug #10541 for more.
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 14 Apr 2007 12:41:37 -0400
xorg-server (2:1.2.99.905-2) experimental; urgency=low
diff --git a/debian/patches/05_module_defaults.diff b/debian/patches/05_module_defaults.diff
new file mode 100644
index 0000000..27c1b58
--- /dev/null
+++ b/debian/patches/05_module_defaults.diff
@@ -0,0 +1,264 @@
+diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
+index 22d229c..1b387d5 100644
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -254,6 +254,7 @@ xf86ModulelistFromConfig(pointer **optlist)
+ char *ignore[] = { "GLcore", "speedo", "bitmap", "drm", NULL };
+ pointer *optarray;
+ XF86LoadPtr modp;
++ Bool found;
+
+ /*
+ * make sure the config file has been parsed and that we have a
+@@ -266,34 +267,66 @@ xf86ModulelistFromConfig(pointer **optlist)
+ }
+
+ if (xf86configptr->conf_modules) {
+- /*
+- * Walk the list of modules in the "Module" section to determine how
+- * many we have.
+- */
+- modp = xf86configptr->conf_modules->mod_load_lst;
+- while (modp) {
+- for (i = 0; ignore[i]; i++) {
+- if (strcmp(modp->load_name, ignore[i]) == 0)
+- modp->ignore = 1;
++ /* Walk the disable list and let people know what we've parsed to
++ * not be loaded
++ */
++ modp = xf86configptr->conf_modules->mod_disable_lst;
++ while (modp) {
++ xf86Msg(X_WARNING, "\"%s\" will not be loaded unless you've specified it to be loaded elsewhere.\n", modp->load_name);
++ modp = (XF86LoadPtr) modp->list.next;
++ }
++ /*
++ * Walk the default settings table. For each module listed to be
++ * loaded, make sure it's in the mod_load_lst. If it's not, make
++ * sure it's not in the mod_no_load_lst. If it's not disabled,
++ * append it to mod_load_lst
++ */
++ for (i=0 ; ModuleDefaults[i].name != NULL ; i++) {
++ if (ModuleDefaults[i].toLoad == FALSE) {
++ xf86Msg(X_WARNING, "\"%s\" is not to be loaded by default. Skipping.\n", ModuleDefaults[i].name);
++ continue;
+ }
+- if (!modp->ignore)
+- count++;
+- modp = (XF86LoadPtr) modp->list.next;
+- }
++ found = FALSE;
++ modp = xf86configptr->conf_modules->mod_load_lst;
++ while (modp) {
++ if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
++ found = TRUE;
++ break;
++ }
++ modp = (XF86LoadPtr) modp->list.next;
++ }
++ if (found == FALSE) {
++ modp = xf86configptr->conf_modules->mod_disable_lst;
++ while (modp) {
++ if (strcmp(modp->load_name, ModuleDefaults[i].name) == 0) {
++ found = TRUE;
++ break;
++ }
++ modp = (XF86LoadPtr) modp->list.next;
++ }
++ }
++ if (found == FALSE) {
++ XF86ConfModulePtr ptr = xf86configptr->conf_modules;
++ ptr = xf86addNewLoadDirective(ptr, ModuleDefaults[i].name, XF86_LOAD_MODULE, ModuleDefaults[i].load_opt);
++ }
++ }
++
++ /*
++ * Walk the list of modules in the "Module" section to determine how
++ * many we have.
++ */
++ modp = xf86configptr->conf_modules->mod_load_lst;
++ while (modp) {
++ for (i = 0; ignore[i]; i++) {
++ if (strcmp(modp->load_name, ignore[i]) == 0)
++ modp->ignore = 1;
++ }
++ if (!modp->ignore)
++ count++;
++ modp = (XF86LoadPtr) modp->list.next;
++ }
+ } else {
+- xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
+- }
+-
+- if (count == 0) {
+- XF86ConfModulePtr ptr = xf86configptr->conf_modules;
+- ptr = xf86addNewLoadDirective(ptr, "extmod", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "dbe", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "glx", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "freetype", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "type1", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "record", XF86_LOAD_MODULE, NULL);
+- ptr = xf86addNewLoadDirective(ptr, "dri", XF86_LOAD_MODULE, NULL);
+- count = 7;
++ xf86configptr->conf_modules = xnfcalloc(1, sizeof(XF86ConfModuleRec));
+ }
+
+ /*
+@@ -303,22 +336,22 @@ xf86ModulelistFromConfig(pointer **optlist)
+ optarray = xnfalloc((count + 1) * sizeof(pointer));
+ count = 0;
+ if (xf86configptr->conf_modules) {
+- modp = xf86configptr->conf_modules->mod_load_lst;
+- while (modp) {
++ modp = xf86configptr->conf_modules->mod_load_lst;
++ while (modp) {
+ if (!modp->ignore) {
+- modulearray[count] = modp->load_name;
+- optarray[count] = modp->load_opt;
+- count++;
++ modulearray[count] = modp->load_name;
++ optarray[count] = modp->load_opt;
++ count++;
+ }
+- modp = (XF86LoadPtr) modp->list.next;
+- }
++ modp = (XF86LoadPtr) modp->list.next;
++ }
+ }
+ modulearray[count] = NULL;
+ optarray[count] = NULL;
+ if (optlist)
+- *optlist = optarray;
++ *optlist = optarray;
+ else
+- xfree(optarray);
++ xfree(optarray);
+ return modulearray;
+ }
+
+diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h
+index 0786ec6..3fe74fa 100644
+--- a/hw/xfree86/common/xf86Config.h
++++ b/hw/xfree86/common/xf86Config.h
+@@ -46,6 +46,23 @@ typedef enum _ConfigStatus {
+ CONFIG_NOFILE
+ } ConfigStatus;
+
++typedef struct _ModuleDefault {
++ char *name;
++ Bool toLoad;
++ pointer *load_opt;
++} ModuleDefault;
++
++static ModuleDefault ModuleDefaults[] = {
++ {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "freetype", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "type1", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "record", .toLoad = TRUE, .load_opt=NULL},
++ {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
++ {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
++};
++
+ /*
+ * prototypes
+ */
+diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
+index f05ada6..a97196b 100644
+--- a/hw/xfree86/doc/man/xorg.conf.man.pre
++++ b/hw/xfree86/doc/man/xorg.conf.man.pre
+@@ -639,6 +639,20 @@ Example: the Type 1 font rasteriser can be loaded with the following entry:
+ .B "Load \*qtype1\*q"
+ .RE
+ .RE
++.TP 7
++.BI "Disable \*q" modulename \*q
++This instructs the server to not load the module called
++.IR modulename .
++Some modules are loaded by default in the server, and this overrides that
++default. If a
++.B Load
++instruction is given for the same module, it overrides the
++.B Disable
++instruction and the module is loaded. The module name given should be the
++module's standard name, not the module file name. As with the
++.B Load
++instruction, the standard name is case-sensitive, and does not include the
++"lib" prefix, or the ".a", ".o", or ".so" suffixes.
+ .PP
+ The second form of entry is a
+ .BR SubSection,
+diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c
+index f3ed9d1..7cd94ea 100644
+--- a/hw/xfree86/parser/Module.c
++++ b/hw/xfree86/parser/Module.c
+@@ -76,6 +76,7 @@ static xf86ConfigSymTabRec ModuleTab[] =
+ {
+ {ENDSECTION, "endsection"},
+ {LOAD, "load"},
++ {DISABLE, "disable"},
+ {LOAD_DRIVER, "loaddriver"},
+ {SUBSECTION, "subsection"},
+ {-1, ""},
+@@ -141,6 +142,13 @@ xf86parseModuleSection (void)
+ xf86addNewLoadDirective (ptr->mod_load_lst, val.str,
+ XF86_LOAD_MODULE, NULL);
+ break;
++ case DISABLE:
++ if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
++ Error (QUOTE_MSG, "Disable");
++ ptr->mod_disable_lst =
++ xf86addNewLoadDirective (ptr->mod_disable_lst, val.str,
++ XF86_DISABLE_MODULE, NULL);
++ break;
+ case LOAD_DRIVER:
+ if (xf86getSubToken (&(ptr->mod_comment)) != STRING)
+ Error (QUOTE_MSG, "LoadDriver");
+@@ -257,6 +265,15 @@ xf86freeModules (XF86ConfModulePtr ptr)
+ lptr = lptr->list.next;
+ xf86conffree (prev);
+ }
++ lptr = ptr->mod_disable_lst;
++ while (lptr)
++ {
++ TestFree (lptr->load_name);
++ TestFree (lptr->load_comment);
++ prev = lptr;
++ lptr = lptr->list.next;
++ xf86conffree (prev);
++ }
+ TestFree (ptr->mod_comment);
+ xf86conffree (ptr);
+ }
+diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h
+index a682927..d5a9d87 100644
+--- a/hw/xfree86/parser/xf86Parser.h
++++ b/hw/xfree86/parser/xf86Parser.h
+@@ -82,6 +82,7 @@ XF86ConfFilesRec, *XF86ConfFilesPtr;
+ /* Values for load_type */
+ #define XF86_LOAD_MODULE 0
+ #define XF86_LOAD_DRIVER 1
++#define XF86_DISABLE_MODULE 2
+
+ typedef struct
+ {
+@@ -97,6 +98,7 @@ XF86LoadRec, *XF86LoadPtr;
+ typedef struct
+ {
+ XF86LoadPtr mod_load_lst;
++ XF86LoadPtr mod_disable_lst;
+ char *mod_comment;
+ }
+ XF86ConfModuleRec, *XF86ConfModulePtr;
+diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h
+index d5948dd..822bbb9 100644
+--- a/hw/xfree86/parser/xf86tokens.h
++++ b/hw/xfree86/parser/xf86tokens.h
+@@ -170,6 +170,7 @@ typedef enum {
+ /* Module tokens */
+ LOAD,
+ LOAD_DRIVER,
++ DISABLE,
+
+ /* Device tokens */
+ DRIVER,
diff --git a/debian/patches/07_xorgconf_manpage_overhaul.diff b/debian/patches/07_xorgconf_manpage_overhaul.diff
index bc2d887..df8c300 100644
--- a/debian/patches/07_xorgconf_manpage_overhaul.diff
+++ b/debian/patches/07_xorgconf_manpage_overhaul.diff
@@ -13,8 +13,8 @@ NOTE: Branden you must really love this package!
Index: hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- hw/xfree86/doc/man/xorg.conf.man.pre.orig 2006-12-02 11:14:28.000000000 +0100
-+++ hw/xfree86/doc/man/xorg.conf.man.pre 2006-12-02 11:15:37.000000000 +0100
+--- hw/xfree86/doc/man/xorg.conf.man.pre.orig 2007-04-14 12:40:43.000000000 -0400
++++ hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-14 12:40:46.000000000 -0400
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH __xconfigfile__ __filemansuffix__ __vendorversion__
@@ -729,7 +729,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
.RS 7
Example: the Type 1 font rasteriser can be loaded with the following entry:
-@@ -649,13 +711,13 @@
+@@ -663,13 +725,13 @@
that are passed to the module when it is loaded.
.PP
Example: the extmod module (which contains a miscellaneous group of
@@ -745,7 +745,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B EndSubSection
.fi
.RE
-@@ -677,17 +739,20 @@
+@@ -691,17 +753,20 @@
.fi
.RE
.PP
@@ -775,7 +775,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
.B InputDevice
sections have the following format:
-@@ -709,18 +774,21 @@
+@@ -723,18 +788,21 @@
.B Driver
entries are required in all
.B InputDevice
@@ -800,7 +800,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B InputDevice
section is considered active if it is referenced by an active
.B ServerLayout
-@@ -730,7 +798,10 @@
+@@ -744,7 +812,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.
@@ -812,7 +812,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
In the absence of an explicitly specified core input device, the first
.B InputDevice
-@@ -738,21 +809,24 @@
+@@ -752,21 +823,24 @@
.B CorePointer
(or
.BR CoreKeyboard )
@@ -845,7 +845,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B ServerLayout
section, or from the
.B \-pointer
-@@ -764,8 +838,9 @@
+@@ -778,8 +852,9 @@
.TP 7
.BI "Option \*qCoreKeyboard\*q"
When this is set, the input device is to be installed as the core
@@ -857,7 +857,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B ServerLayout
section, or from the
.B \-keyboard
-@@ -779,19 +854,21 @@
+@@ -793,19 +868,21 @@
.TP 7
.BI "Option \*qSendCoreEvents\*q \*q" boolean \*q
Both of these options are equivalent, and when enabled cause the
@@ -885,7 +885,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
.B Device
sections have the following format:
-@@ -817,27 +894,30 @@
+@@ -831,27 +908,30 @@
.PP
The
.B Identifier
@@ -924,7 +924,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
Note that most of the
.B Options
listed here (but not the other entries) may be specified in the
-@@ -846,118 +926,132 @@
+@@ -860,118 +940,132 @@
.B Device
section.
.TP 7
@@ -1122,7 +1122,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.ig
.TP 7
This optional entry allows an IRQ number to be specified.
-@@ -966,19 +1060,22 @@
+@@ -980,19 +1074,22 @@
.B Options
Option flags may be specified in the
.B Device
@@ -1151,7 +1151,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
but a default configuration will be created when one isn't specified.
.PP
.B Monitor
-@@ -1002,22 +1099,25 @@
+@@ -1016,22 +1113,25 @@
.PP
The
.B Identifier
@@ -1184,7 +1184,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
The entries that may be used in
.B Monitor
-@@ -1029,69 +1129,78 @@
+@@ -1043,69 +1143,78 @@
.BI "ModelName \*q" model \*q
This optional entry specifies the monitor's model.
.TP 7
@@ -1299,7 +1299,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.RS 7
.TP 4
.BI "DotClock " clock
-@@ -1127,52 +1236,60 @@
+@@ -1141,52 +1250,60 @@
may be used to select the composite sync polarity.
.TP 4
.BI "HSkew " hskew
@@ -1382,7 +1382,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B Interlace
indicates that the mode is interlaced.
.B DoubleScan
-@@ -1191,7 +1308,8 @@
+@@ -1205,7 +1322,8 @@
.B +CSync
and
.B \-CSync
@@ -1392,7 +1392,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B HSkew
and
.B VScan
-@@ -1215,20 +1333,22 @@
+@@ -1229,20 +1347,22 @@
should aim for when selecting video modes. Without this option, the
default is to prefer modes with higher refresh rates.
@@ -1420,7 +1420,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
will be sufficient.
.PP
.B Modes
-@@ -1256,21 +1376,24 @@
+@@ -1270,21 +1390,24 @@
entries that are described above in the
.B Monitor
section.
@@ -1451,7 +1451,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B Screen
section found in the config file is considered the active one.
.PP
-@@ -1298,94 +1421,104 @@
+@@ -1312,94 +1435,104 @@
.B Identifier
and
.B Device
@@ -1592,7 +1592,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.TP 7
.BI "Option \*qNoMTRR\*q"
Disables MTRR (Memory Type Range Register) support, a feature of modern
-@@ -1395,14 +1528,14 @@
+@@ -1409,14 +1542,14 @@
.TP 7
.BI "Option \*qXaaNoCPUToScreenColorExpandFill\*q"
Disables accelerated rectangular expansion blits from source patterns
@@ -1610,7 +1610,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
pattern.
.TP 7
.BI "Option \*qXaaNoDashedBresenhamLine\*q"
-@@ -1412,8 +1545,8 @@
+@@ -1426,8 +1559,8 @@
Disables accelerated dashed line draws between two arbitrary points.
.TP 7
.BI "Option \*qXaaNoImageWriteRect\*q"
@@ -1621,7 +1621,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.TP 7
.BI "Option \*qXaaNoMono8x8PatternFillRect\*q"
Disables accelerated fills of a rectangular region with a monochrome
-@@ -1434,7 +1567,7 @@
+@@ -1448,7 +1581,7 @@
stored in system memory (one scan line at a time).
.TP 7
.BI "Option \*qXaaNoScanlineImageWriteRect\*q"
@@ -1630,7 +1630,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
system memory to video memory (one scan line at a time).
.TP 7
.BI "Option \*qXaaNoScreenToScreenColorExpandFill\*q"
-@@ -1449,10 +1582,10 @@
+@@ -1463,10 +1596,10 @@
Disables accelerated solid Bresenham line draws.
.TP 7
.BI "Option \*qXaaNoSolidFillRect\*q"
@@ -1643,7 +1643,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.TP 7
.BI "Option \*qXaaNoSolidHorVertLine\*q"
Disables accelerated solid horizontal and vertical line draws.
-@@ -1464,27 +1597,30 @@
+@@ -1478,27 +1611,30 @@
.B Screen
section may optionally contain one or more
.B Display
@@ -1684,7 +1684,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
.B Display
subsections have the following format:
-@@ -1498,78 +1634,88 @@
+@@ -1512,78 +1648,88 @@
.B " EndSubSection"
.fi
.RE
@@ -1813,7 +1813,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
When this entry is omitted, the valid modes referenced by the appropriate
.B Monitor
section will be used. If the
-@@ -1577,10 +1723,12 @@
+@@ -1591,10 +1737,12 @@
section contains no modes, then the selection will be taken from the
built-in VESA standard modes.
.TP 7
@@ -1830,7 +1830,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.BR PseudoColor ):
.PP
.RS 11
-@@ -1626,43 +1774,48 @@
+@@ -1640,43 +1788,48 @@
.RE
.TP 7
.BI "Black " "red green blue"
@@ -1896,7 +1896,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B ServerLayout
sections are present, the single active screen and two active (core)
input devices are selected as described in the relevant sections above.
-@@ -1674,9 +1827,9 @@
+@@ -1688,9 +1841,9 @@
.nf
.B "Section \*qServerLayout\*q"
.BI " Identifier \*q" name \*q
@@ -1908,7 +1908,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.I " ..."
.I " options"
.I " ..."
-@@ -1694,10 +1847,11 @@
+@@ -1708,10 +1861,11 @@
.PP
The
.B Identifier
@@ -1922,7 +1922,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.BR Options .
The
.B ServerFlags
-@@ -1708,21 +1862,25 @@
+@@ -1722,21 +1876,25 @@
.PP
The entries that may be used in this section are described here.
.TP 7
@@ -1959,7 +1959,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.RS 7
.TP 4
.I "x y"
-@@ -1732,48 +1890,53 @@
+@@ -1746,48 +1904,53 @@
.RI ( x , y ).
The
.B Absolute
@@ -2033,7 +2033,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.PP
.RS 11
.nf
-@@ -1791,8 +1954,9 @@
+@@ -1805,8 +1968,9 @@
.B Options
In addition to the following, any option permitted in the
.B ServerFlags
@@ -2045,7 +2045,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.B ServerFlags
section.
.TP 7
-@@ -1805,9 +1969,11 @@
+@@ -1819,9 +1983,11 @@
.BR "DEVICE SECTION" ,
above) for the format of the
.I bus\-id
@@ -2059,7 +2059,7 @@ Index: hw/xfree86/doc/man/xorg.conf.man.pre
.TP 7
.BI "Option \*qSingleCard\*q \*q" boolean \*q
As
-@@ -1831,68 +1997,102 @@
+@@ -1845,68 +2011,102 @@
.B "EndSection"
.fi
.RE
diff --git a/debian/patches/34_xorg.conf_man_typos.patch b/debian/patches/34_xorg.conf_man_typos.patch
index e348dbc..661a775 100644
--- a/debian/patches/34_xorg.conf_man_typos.patch
+++ b/debian/patches/34_xorg.conf_man_typos.patch
@@ -1,8 +1,8 @@
Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
===================================================================
---- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-12-02 11:15:37.000000000 +0100
-+++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2006-12-02 11:19:19.000000000 +0100
-@@ -1186,7 +1186,7 @@
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-14 12:41:00.000000000 -0400
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-14 12:41:03.000000000 -0400
+@@ -1200,7 +1200,7 @@
.B Modes
section called
.IR modesection\-id.
diff --git a/debian/patches/series b/debian/patches/series
index 1e0ee99..cd19784 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
02_libvgahw_gcc4_volatile_fix.diff
03_xnest_manpage_overhaul.diff
04_read_rom_in_chunks.diff
+05_module_defaults.diff
07_xorgconf_manpage_overhaul.diff -p0
08_s390_servermd.diff
09_debian_xserver_rtff.diff -p0
Reply to: