xorg: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/local/dexconf | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit bff00c06cc9b2180afcfe3fc7ae451c12e2c3b24
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Thu Nov 29 17:38:22 2007 +0200
dexconf: purge extra_options and some old cruft.
diff --git a/debian/changelog b/debian/changelog
index 59903f2..8147d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.3+7ubuntu2) hardy; urgency=low
+
+ * dexconf: purge unneeded cruft. Restricted-manager no longer needs
+ extra_options.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 29 Nov 2007 17:30:06 +0200
+
xorg (1:7.3+7ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 776e555..c6baad4 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -246,12 +246,6 @@ db_get xserver-$SERVER/config/device/bus_id
DEVICE_BUSID="$RET"
db_get xserver-$SERVER/config/device/use_fbdev
DEVICE_USE_FBDEV="$RET"
-db_capb backup escape
-db_get xserver-$SERVER/config/device/extra_options
-DEVICE_EXTRA_OPTIONS="$RET"
-db_capb backup
-fetch xserver-$SERVER/config/monitor/identifier
-MONITOR_IDENTIFIER="$RET"
exec 4>"$DEXCONFTMPDIR/Device"
cat >&4 <<SECTION
Section "Device"
@@ -268,7 +262,6 @@ fi
if [ "$DEVICE_USE_FBDEV" = "true" ]; then
printf "\tOption\t\t\"UseFBDev\"\t\t\"$DEVICE_USE_FBDEV\"\n" >&4
fi
-printf "$DEVICE_EXTRA_OPTIONS" | perl -nae 'print "\tOption\t\t\"$F[0]\"\t\t\"@F[1..$#F]\"\n"' >&4
printf "EndSection\n" >&4
### MONITOR
Reply to: