On Tue, Oct 24, 2006 at 02:32:31 +0200, Juliusz Chroboczek wrote: > Me: > > >> I would like to argue that the "type1" backend should not be loaded by > >> default. > > Julien: > > > To do this, it seems to be sufficient to remove "type1" from the > > DEFAULT_MODULES variable in xserver-xorg.config.in, and maybe from the > > Default line of the xserver-xorg/config/modules debconf template. > > And I still recommend that this should be done. I also recommend that > existing xorg.conf files should be rewritten to remove the line which > loads the "type1" module, which I understand would not be done by > merely doing the above. > The attached patch should do that. David, do you agree with this? (if so, I'll commit it to trunk) Cheers, Julien
Index: debian/xserver-xorg.postinst.in
===================================================================
--- debian/xserver-xorg.postinst.in (revision 3893)
+++ debian/xserver-xorg.postinst.in (working copy)
@@ -1374,7 +1374,7 @@
db_set xserver-xorg/config/modules "$MODULES"
fi
-DEFAULT_MODULES='i2c, bitmap, ddc, dri, extmod, freetype, glx, int10, type1, vbe'
+DEFAULT_MODULES='i2c, bitmap, ddc, dri, extmod, freetype, glx, int10, vbe'
if [ "$ARCH" = 'sparc' ]; then
DEFAULT_MODULES="${DEFAULT_MODULES}, cfb, cfb32"
fi
@@ -2015,6 +2015,7 @@
/^[[:space:]]*Section[[:space:]]\+"Module"[[:space:]]*$/,/^[[:space:]]*EndSection[[:space:]]*$/ {
/^[[:space:]]*Load[[:space:]]\+"GLcore"[[:space:]]*$/d
/^[[:space:]]*Load[[:space:]]\+"speedo"[[:space:]]*$/d
+ /^[[:space:]]*Load[[:space:]]\+"type1"[[:space::]]*$/d
}
/^[[:space:]]*Section[[:space:]]\+"Files"[[:space:]]*$/,/*[[:space:]]*EndSection[[:space:]]*$/ {
# Delete the module path
Index: debian/xserver-xorg.templates
===================================================================
--- debian/xserver-xorg.templates (revision 3893)
+++ debian/xserver-xorg.templates (working copy)
@@ -74,8 +74,8 @@
Template: xserver-xorg/config/modules
Type: multiselect
-Choices: bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record, type1, v4l, vbe
-Default: bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record, type1, vbe
+Choices: bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record, v4l, vbe
+Default: bitmap, dbe, ddc, dri, extmod, freetype, glx, int10, record, vbe
_Description: X.Org server modules that should be loaded by default:
This option is recommended to experienced users only. In most
cases, all of these modules should be enabled.
@@ -93,7 +93,7 @@
- extmod: enables many traditional and commonly used extensions, such as
shaped windows, shared memory, video mode switching, DGA, and Xv;
- record: implements the RECORD extension, often used in server testing;
- - bitmap: font rasterizer (so are freetype, and type1 modules).
+ - bitmap: font rasterizer (so is the freetype module).
.
For further information about these modules, please consult the X.Org
documentation.
Attachment:
signature.asc
Description: Digital signature