xorg: Changes to 'debian-experimental'
debian/changelog | 8 ++++++++
debian/local/dexconf | 14 +++-----------
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit ac3bb8a797b09ed7530f082149052671bb31c54b
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Apr 15 13:43:16 2007 -0400
* 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
diff --git a/debian/changelog b/debian/changelog
index e67d317..01d30ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- David Nusinow <dnusinow@debian.org> Sun, 15 Apr 2007 13:42:02 -0400
+
xorg (1:7.2-2) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/local/dexconf b/debian/local/dexconf
index e835e21..48e0b27 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -160,7 +160,7 @@ fi
# xorg.conf sections:
# Files File pathnames
# ServerFlags Server flags NOT USED BY DEXCONF
-# Module Dynamic module loading
+# 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
@@ -168,7 +168,7 @@ fi
# Modes Video modes descriptions NOT USED BY DEXCONF
# Screen Screen configuration
# ServerLayout Overall layout
-# DRI DRI-specific configuration
+# DRI DRI-specific configuration NOT USED BY DEXCONF
# Vendor Vendor-specific configuration NOT USED BY DEXCONF
### HEADER
@@ -399,14 +399,6 @@ if [ -n "$LAPTOP" ]; then
fi
printf "EndSection\n" >&4
-### DRI
-exec 4>"$DEXCONFTMPDIR/DRI"
-cat >&4 <<SECTION
-Section "DRI"
- Mode 0666
-EndSection
-SECTION
-
# Close file descriptor 4 before we delete temporary files
exec 4<&-
@@ -422,7 +414,7 @@ umask 022
SPACER=
for SECTION in Header Files InputDeviceKeyboard InputDeviceMouse \
- Device Monitor Screen ServerLayout DRI; do
+ Device Monitor Screen ServerLayout; do
if [ -e "$DEXCONFTMPDIR/$SECTION" ]; then
eval $SPACER
cat "$DEXCONFTMPDIR/$SECTION" >>"$OUTFILE"
Reply to: