xorg: Changes to 'debian-unstable'
debian/changelog | 9 ++++++++-
debian/control | 2 +-
debian/local/dexconf | 12 ------------
debian/xserver-xorg.templates | 2 +-
4 files changed, 10 insertions(+), 15 deletions(-)
New commits:
commit 49af6589b15a2bcfd14d6447a4fac23c692cd512
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Apr 29 21:20:56 2007 -0400
Don't write the files section of xorg.conf by default.
If the user does want to write the files section, don't write out any font
paths, only write out the font server bit if they specify that.
This will depend on having xserver-xorg-core version 2:1.3.0.0.dfsg-3
which includes a patch to always look in the default font paths by
default. Bump the xserver-xorg dependency on xserver-xorg-core to this
version.
diff --git a/debian/changelog b/debian/changelog
index ef61c4a..ff1b75e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,13 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
* Don't write the DRI section to xorg.conf. We now ship a default mode in
libdrm as of libdrm 2.3.0-3, so we don't need to do this. Users can still
override the default mode in their xorg.conf's if they choose
+ * Don't write the files section of xorg.conf by default. If the user does
+ want to write the files section, don't write out any font paths, only
+ write out the font server bit if they specify that.
+ + This will depend on having xserver-xorg-core version 2:1.3.0.0.dfsg-3
+ which includes a patch to always look in the default font paths by
+ default. Bump the xserver-xorg dependency on xserver-xorg-core to this
+ version.
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
@@ -51,7 +58,7 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
* debian/xserver-xorg.postinst.in: ATI vendor string was changed in
discover-data_2.2006.08.15, so edit them to reflect the change.
- -- Timo Aaltonen <tjaalton@cc.hut.fi> Wed, 25 Apr 2007 16:56:19 +0300
+ -- David Nusinow <dnusinow@debian.org> Sun, 29 Apr 2007 21:17:18 -0400
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 6c86c94..c34cef1 100644
--- a/debian/control
+++ b/debian/control
@@ -82,7 +82,7 @@ Architecture: all
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common
Replaces: xserver-common
Pre-Depends: x11-common (>= 7.0.0-0ubuntu3)
-Depends: xserver-xorg-core (>= 2:1.2.99.905-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
+Depends: xserver-xorg-core (>= 2:1.3.0.0.dfsg-3), xserver-xorg-video-all | xserver-xorg-video-1.0, xserver-xorg-input-all | xserver-xorg-input, ${misc:Depends}, xkb-data | xkb-data-legacy, xbase-clients
Recommends: xserver-xorg-video-all, xserver-xorg-input-all, laptop-detect, xresprobe, mdetect, discover1 | discover, ${F:XServer-Xorg-Detect-Depends}
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 48e0b27..020001d 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -215,18 +215,6 @@ SECTION
FontPath "$FONTSERVER"
SECTION
fi
- cat >&4 <<SECTION
- FontPath "/usr/share/fonts/X11/misc"
- FontPath "/usr/share/fonts/X11/cyrillic"
- FontPath "/usr/share/fonts/X11/100dpi/:unscaled"
- FontPath "/usr/share/fonts/X11/75dpi/:unscaled"
- FontPath "/usr/share/fonts/X11/Type1"
- FontPath "/usr/share/fonts/X11/100dpi"
- FontPath "/usr/share/fonts/X11/75dpi"
- # path to defoma fonts
- FontPath "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
-EndSection
-SECTION
fi
### KEYBOARD / INPUTDEVICE
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 6361227..4ddc528 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -67,7 +67,7 @@ _Description: Desired default X server:
Template: xserver-xorg/config/write_files_section
Type: boolean
-Default: true
+Default: false
_Description: Write default Files section to configuration file?
The Files section of the X server configuration file tells the X server where
to find server modules, the RGB color database, and font files. This option
Reply to: