xorg-server: Changes to 'debian-unstable'
debian/patches/94_use_default_font_path.diff | 24 ++++++++++++++++++++----
debian/xserver-xorg-core.NEWS | 17 +++++++++++++++++
2 files changed, 37 insertions(+), 4 deletions(-)
New commits:
commit 0f7a04aaba2ab391cfc46cb4393ea55a013e0ba4
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Apr 24 21:44:37 2007 -0400
Document UseDefaultFontPath in the xorg.conf manpage
diff --git a/debian/patches/94_use_default_font_path.diff b/debian/patches/94_use_default_font_path.diff
index b548aee..47cf926 100644
--- a/debian/patches/94_use_default_font_path.diff
+++ b/debian/patches/94_use_default_font_path.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-24 00:16:32.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-24 00:17:32.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-04-24 21:39:54.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Config.c 2007-04-24 21:39:54.000000000 -0400
@@ -637,16 +637,24 @@
char *log_buf;
@@ -77,8 +77,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
|| !configDRI(xf86configptr->conf_dri)
Index: xorg-server/hw/xfree86/common/xf86Privstr.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2007-04-21 09:31:59.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Privstr.h 2007-04-24 00:17:32.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86Privstr.h 2007-04-24 21:33:59.000000000 -0400
++++ xorg-server/hw/xfree86/common/xf86Privstr.h 2007-04-24 21:39:54.000000000 -0400
@@ -166,6 +166,8 @@
MessageType randRFrom;
Bool aiglx;
@@ -88,3 +88,19 @@ Index: xorg-server/hw/xfree86/common/xf86Privstr.h
Bool ignoreABI;
struct {
Bool disabled; /* enable/disable deactivating
+Index: xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre
+===================================================================
+--- xorg-server.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-24 21:40:36.000000000 -0400
++++ xorg-server/hw/xfree86/doc/man/xorg.conf.man.pre 2007-04-24 21:43:29.000000000 -0400
+@@ -664,6 +664,11 @@
+ .BI "Option \*qAIGLX\*q \*q" boolean \*q
+ enable or disable AIGLX. AIGLX is enabled by default.
+ .TP 7
++.BI "Option \*qUseDefaultFontPath\*q \*q" boolean \*q
++Include the default font path even if other paths are specified in
++xorg.conf. If enabled, other font paths are included as well. Enabled by
++default.
++.TP 7
+ .BI "Option \*qIgnoreABI\*q \*q" boolean \*q
+ Allow modules built for a different, potentially incompatible version of
+ the X server to load. Disabled by default.
commit 14a60faeec8a4f5e5bab6549acf475f4ae7f3288
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Apr 24 21:39:05 2007 -0400
Add NEWS.Debian entry about the default font patch
diff --git a/debian/xserver-xorg-core.NEWS b/debian/xserver-xorg-core.NEWS
index 1bb2865..8552040 100644
--- a/debian/xserver-xorg-core.NEWS
+++ b/debian/xserver-xorg-core.NEWS
@@ -1,3 +1,20 @@
+xorg-server (2:1.3.0.0.dfsg-3) unstable; urgency=low
+
+ * The server now includes a patch to always include the font paths
+ defined at compile-time by default. This will help prevent errors with
+ finding fonts when a xorg.conf has alternate font paths specified.
+
+ As a result of this, many of the font paths shipped in our default
+ xorg.conf are obsolete, and may be deleted. If you have no customized
+ your xorg.conf, a future update to the xserver-xorg package will
+ re-create the file from your stored preferences.
+
+ If for some reason you do not want the server to look in the default
+ font paths, you can set the boolean variable "UseDefaultFontPath" to
+ "False" in the ServerFlags section of your xorg.conf.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 24 Apr 2007 00:18:04 -0400
+
xorg-server (2:1.2.99.905-3) experimental; urgency=low
* This server update includes a patch to enable proper module defaults in
Reply to: