xorg: Changes to 'debian-experimental'
debian/changelog | 1 +
debian/local/dexconf | 28 ++++------------------------
2 files changed, 5 insertions(+), 24 deletions(-)
New commits:
commit ab4e6f6be2805d997c6eaea3649858648e3e3248
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 9 17:27:28 2009 +0100
dexconf: don't write empty Monitor and Screen sections.
diff --git a/debian/changelog b/debian/changelog
index 43449ff..f00ca5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ xorg (1:7.4~6) UNRELEASED; urgency=low
upgrade.
* We don't use dmidecode and fbset anymore (they were used for hardware
detection), so stop adding Recommends on them.
+ * dexconf: don't write empty Monitor and Screen sections.
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 23 Jan 2009 14:53:45 +0200
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 1552a4b..3cc8e89 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -137,15 +137,15 @@ else
fi
# xorg.conf sections:
-# Files File pathnames
+# Files File pathnames NOT USED BY DEXCONF
# ServerFlags Server flags NOT USED BY DEXCONF
# Module Dynamic module loading NOT USED BY DEXCONF
# InputDevice Input device description
# Device Graphics device description
# VideoAdaptor Xv video adaptor description NOT USED BY DEXCONF
-# Monitor Monitor description
+# Monitor Monitor description NOT USED BY DEXCONF
# Modes Video modes descriptions NOT USED BY DEXCONF
-# Screen Screen configuration
+# Screen Screen configuration NOT USED BY DEXCONF
# ServerLayout Overall layout NOT USED BY DEXCONF
# DRI DRI-specific configuration NOT USED BY DEXCONF
# Vendor Vendor-specific configuration NOT USED BY DEXCONF
@@ -235,25 +235,6 @@ if [ "$DEVICE_USE_FBDEV" = "true" ]; then
fi
printf "EndSection\n" >&4
-### MONITOR
-
-exec 4>"$DEXCONFTMPDIR/Monitor"
-cat >&4 <<SECTION
-Section "Monitor"
- Identifier "Configured Monitor"
-EndSection
-SECTION
-
-### SCREEN
-
-exec 4>"$DEXCONFTMPDIR/Screen"
-cat >&4 <<SECTION
-Section "Screen"
- Identifier "Default Screen"
- Monitor "Configured Monitor"
-SECTION
-printf "EndSection\n" >&4
-
# Close file descriptor 4 before we delete temporary files
exec 4<&-
@@ -268,8 +249,7 @@ umask 022
: >"$OUTFILE"
SPACER=
-for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \
- Device Monitor Screen ; do
+for SECTION in Header InputDeviceKeyboard InputDeviceMouse Device ; do
if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
eval $SPACER
cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE"
Reply to: