xorg: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/local/dexconf | 19 ++-----------------
2 files changed, 9 insertions(+), 17 deletions(-)
New commits:
commit 09b223f00c54f09696cf13aed0d200b5884c9f00
Author: David Nusinow <dnusinow@debian.org>
Date: Tue Oct 2 22:20:13 2007 -0400
dexconf: Don't write the server layout.
The server no longer requires one by default as of 1.4.
diff --git a/debian/changelog b/debian/changelog
index 5ad2fc0..72deda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+3) UNRELEASED; urgency=low
+
+ * dexconf: Don't write the server layout. The server no longer requires one
+ by default as of 1.4.
+
+ -- David Nusinow <dnusinow@debian.org> Tue, 02 Oct 2007 22:15:59 -0400
+
xorg (1:7.3+2) unstable; urgency=low
* Upload to unstable
diff --git a/debian/local/dexconf b/debian/local/dexconf
index c5b2a9e..6696360 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -167,7 +167,7 @@ fi
# Monitor Monitor description
# Modes Video modes descriptions NOT USED BY DEXCONF
# Screen Screen configuration
-# ServerLayout Overall layout
+# ServerLayout Overall layout NOT USED BY DEXCONF
# DRI DRI-specific configuration NOT USED BY DEXCONF
# Vendor Vendor-specific configuration NOT USED BY DEXCONF
@@ -372,21 +372,6 @@ SECTION
fi
printf "EndSection\n" >&4
-### SERVERLAYOUT
-
-exec 4>"$DEXCONFTMPDIR/ServerLayout"
-cat >&4 <<SECTION
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Generic Keyboard"
- InputDevice "Configured Mouse"
-SECTION
-if [ -n "$LAPTOP" ]; then
- printf "\tInputDevice\t\"Synaptics Touchpad\"\n" >&4
-fi
-printf "EndSection\n" >&4
-
# Close file descriptor 4 before we delete temporary files
exec 4<&-
@@ -402,7 +387,7 @@ umask 022
SPACER=
for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \
- Device Monitor Screen ServerLayout; do
+ Device Monitor Screen ; do
if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
eval $SPACER
cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE"
Reply to: