xorg: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/local/dexconf | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit af0c30dfe73dcf46876afbcf0962312b044331c2
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Thu Dec 20 20:20:40 2007 +0200
dexconf: Remove reference to xserver-xorg/config/display/modes, which is no longer used.
Also clean up cruft which was left over from the latest merge.
diff --git a/debian/changelog b/debian/changelog
index 5177364..06f8585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+8ubuntu2) hardy; urgency=low
+
+ * dexconf:
+ - Remove reference to xserver-xorg/config/display/modes, which is no
+ longer used.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 20 Dec 2007 20:01:03 +0200
+
xorg (1:7.3+8ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 790fec7..4d9018b 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -273,9 +273,6 @@ printf "EndSection\n" >&4
### SCREEN
-db_get xserver-$SERVER/config/display/modes
-DISPLAY_MODES="$(list_convert $RET)"
-
exec 4>"$DEXCONFTMPDIR/Screen"
cat >&4 <<SECTION
Section "Screen"
@@ -285,11 +282,6 @@ SECTION
if [ -n "$PS3_FB" ]; then
printf "\tDefaultFbBpp 32\n" >&4
fi
- 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 "EndSection\n" >&4
# Close file descriptor 4 before we delete temporary files
Reply to: