xorg: Changes to 'debian-experimental'
debian/changelog | 21 ++++++++++++++++++++-
debian/local/dexconf | 7 ++-----
debian/xserver-xorg.templates | 3 +--
3 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 0a5113f2c743c1955b39b2326b3663ebca97fbcc
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 22:31:02 2007 -0400
Don't write out the font section to xorg.conf by default
diff --git a/debian/changelog b/debian/changelog
index 15c379d..4131303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,11 +22,12 @@ xorg (1:7.2-3) UNRELEASED; urgency=low
write a single "Display" subsection for the screen, and it will contain
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
+ * Don't write out the font section to xorg.conf by default
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
- -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:13:24 -0400
+ -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:30:24 -0400
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index b7c1f39..a89c3de 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -60,7 +60,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
commit 48f729040615d868f16b3e060e91b23deadbf101
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Jun 11 22:29:47 2007 -0400
Slim down the modes we write out by default
The /config/display/modes now has no default (blank). As a result of this,
under normal conditions, this multi-select field will be empty. The
debconfage and dexconf will not fill in this section at all. The server
will then choose the highest resolution that it can probe with DDC. This
should work for most people, who are probably choosing their best
resolution anyway. If xresprobe is available and used, the resolutions it
finds will be selected. Until there is a good way for the server to store
this information by itself, we should leave this as it is. Most people can
get by without this section, but it'll help some of those with broken
hardware.
If the user does select a mode or modes for this question, dexconf no
longer iterates through a set of depths and puts the mode list in for
each. Instead, if dexconf does find a set of specified modes, it will
write a single "Display" subsection for the screen, and it will contain
the modes. This is functionally equivalent to what we were doing anyway,
and it cuts down the number of lines in our xorg.conf considerably.
diff --git a/debian/changelog b/debian/changelog
index 4a8bca5..15c379d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,11 +4,29 @@ 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
+ * Get rid of all the explicit modes by default. They just bloated the
+ default config for no reason.
+ + The /config/display/modes now has no default (blank). As a result of
+ this, under normal conditions, this multi-select field will be empty.
+ The debconfage and dexconf will not fill in this section at all. The
+ server will then choose the highest resolution that it can probe with
+ DDC. This should work for most people, who are probably choosing their
+ best resolution anyway. If xresprobe is available and used, the
+ resolutions it finds will be selected. Until there is a good way for the
+ server to store this information by itself, we should leave this as it
+ is. Most people can get by without this section, but it'll help some of
+ those with broken hardware.
+ + If the user does select a mode or modes for this question, dexconf no
+ longer iterates through a set of depths and puts the mode list in for
+ each. Instead, if dexconf does find a set of specified modes, it will
+ write a single "Display" subsection for the screen, and it will contain
+ the modes. This is functionally equivalent to what we were doing anyway,
+ and it cuts down the number of lines in our xorg.conf considerably.
[ Julien Cristau ]
* xorg recommends libgl1-mesa-dri instead of depending on it.
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Apr 2007 23:13:17 +0200
+ -- David Nusinow <dnusinow@debian.org> Mon, 11 Jun 2007 22:13:24 -0400
xorg (1:7.2-2) experimental; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 48e0b27..801ec31 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -374,14 +374,11 @@ Section "Screen"
Monitor "$MONITOR_IDENTIFIER"
DefaultDepth $DISPLAY_DEFAULT_DEPTH
SECTION
-for DEPTH in 1 4 8 15 16 24; do
- printf "\tSubSection \"Display\"\n" >&4
- printf "\t\tDepth\t\t$DEPTH\n" >&4
if [ -n "$DISPLAY_MODES" ]; then
+ printf "\tSubSection \"Display\"\n" >&4
printf "\t\tModes\t\t$DISPLAY_MODES\n" >&4
+ printf "\tEndSubSection\n" >&4
fi
- printf "\tEndSubSection\n" >&4
-done
printf "EndSection\n" >&4
### SERVERLAYOUT
diff --git a/debian/xserver-xorg.templates b/debian/xserver-xorg.templates
index 32d4c8d..b7c1f39 100644
--- a/debian/xserver-xorg.templates
+++ b/debian/xserver-xorg.templates
@@ -3,7 +3,6 @@
Template: xserver-xorg/config/display/modes
Type: multiselect
Choices: 1920x1440, 1920x1200, 1856x1392, 1792x1344, 1680x1050, 1600x1200, 1440x900, 1400x1050, 1280x1024, 1280x960, 1280x854, 1280x800, 1280x768, 1200x800, 1152x864, 1152x768, 1024x768, 800x600, 640x480
-Default: 1024x768, 800x600, 640x480
_Description: Video modes to be used by the X server:
Please keep only the resolutions you would like the X server to use. Removing
all of them is the same as removing none, since in both cases the
Reply to: