X Strike Force X.Org X11 SVN commit: r3894 - trunk/debian/xorg/debian
Author: julien
Date: 2006-10-23 22:27:09 -0400 (Mon, 23 Oct 2006)
New Revision: 3894
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.postinst.in
trunk/debian/xorg/debian/xserver-xorg.templates
Log:
* Don't load the obsolete Type 1 font backend in the server, as suggested by
Juliusz Chroboczek (closes: #364965).
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-10-23 23:11:50 UTC (rev 3893)
+++ trunk/debian/xorg/debian/changelog 2006-10-24 02:27:09 UTC (rev 3894)
@@ -11,8 +11,10 @@
* Readd /etc/X11/Xresources/x11-common which was lost in the transition from
the monolith. This enables the -color customization, and closes: #365358.
* Delete stampdir in debian/rules clean.
+ * Don't load the obsolete Type 1 font backend in the server, as suggested by
+ Juliusz Chroboczek (closes: #364965).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 24 Oct 2006 01:09:15 +0200
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 24 Oct 2006 04:20:15 +0200
xorg (1:7.1.0-5) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-23 23:11:50 UTC (rev 3893)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-24 02:27:09 UTC (rev 3894)
@@ -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
Modified: trunk/debian/xorg/debian/xserver-xorg.templates
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.templates 2006-10-23 23:11:50 UTC (rev 3893)
+++ trunk/debian/xorg/debian/xserver-xorg.templates 2006-10-24 02:27:09 UTC (rev 3894)
@@ -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.
Reply to: