debian/changelog | 6 +++++-
debian/local/dexconf | 1 -
debian/xserver-xorg.postinst.in | 13 +++++++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 0c288a3f8ff4e3a299dbb972fcbc7bd2960f97c6
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Nov 14 21:37:25 2007 -0500
* Unregister various old questions from the debconf database because we
don't use them any more.
diff --git a/debian/changelog b/debian/changelog
index d15f038..3cc0dc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xorg (1:7.3+5) unstable; urgency=low
section
* Don't have dexconf write "CoreKeyboard" any more. With input-hotplug this
is meaningless
+ * Unregister various old questions from the debconf database because we
+ don't use them any more.
[ Brice Goglin ]
* Replace xorg dependency on xbase-clients and xutils with the corresponding
@@ -16,7 +18,7 @@ xorg (1:7.3+5) unstable; urgency=low
* Reupload, because 1:7.3+4 seems to have been lost in the ftp-master crash.
* Drop code related to shared/default-x-server from xserver-xorg.prerm.
- -- Julien Cristau <[EMAIL PROTECTED]> Mon, 12 Nov 2007 23:01:22 +0100
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 14 Nov 2007 21:29:31 -0500
xorg (1:7.3+4) unstable; urgency=low
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index de79866..12f25a6 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1710,8 +1710,7 @@ if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le
"1:7.0.14"; then
cp "$XORGCONFIG" "$BACKUP_XORGCONFIG"
sed -e'
# Dump obsolete modules
-
/^[[:space:]]*Section[[:space:]]\+"Module"[[:space:]]*$/,/^[[:space:]]*EndSection[[:space:]]*$/
{
- /^[[:space:]]*Load[[:space:]]\+"GLcore"[[:space:]]*$/d
+
/^[[:space:]]*Section[[:space:]]\+"Module"[[:space:]]*$/,/^[[:space:]]*EndSection[[:space:]]*$/
{ /^[[:space:]]*Load[[:space:]]\+"GLcore"[[:space:]]*$/d
/^[[:space:]]*Load[[:space:]]\+"speedo"[[:space:]]*$/d
/^[[:space:]]*Load[[:space:]]\+"type1"[[:space:]]*$/d
}
@@ -1751,6 +1750,16 @@ fi
# Clean up our old crap
rm -f "$SERVER_SYMLINK_CHECKSUM" "$SERVER_SYMLINK_ROSTER"
+for QUESTION in "shared/default-x-server" "xserver-xorg/autodetect_mouse" \
+ "xserver-xorg/config/device/video_ram" \
+ "xserver-xorg/config/inputdevice/mouse/port" \
+ "xserver-xorg/config/inputdevice/mouse/protocol" \
+ "xserver-xorg/config/modules" \
+ "xserver-xorg/config/monitor/default-identifier" \
+ "xserver-xorg/config/monitor/identifier" \
+ "xserver-xorg/config/write_files_section"; do
+ db_unregister "$QUESTION" || true
+done
exit 0
commit f2eb38e355dfdc90dc1d41699e533819009a07fe
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Wed Nov 7 22:36:29 2007 -0500
* Don't have dexconf write "CoreKeyboard" any more. With input-hotplug this
is meaningless
diff --git a/debian/changelog b/debian/changelog
index a0e3420..e2a8da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg (1:7.3+5) UNRELEASED; urgency=low
* Change xlibs-static-dev transitional package from the libs to oldlibs
section
+ * Don't have dexconf write "CoreKeyboard" any more. With input-hotplug this
+ is meaningless
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 05 Nov 2007 15:41:00 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Wed, 07 Nov 2007 22:35:57 -0500
xorg (1:7.3+4) unstable; urgency=low
diff --git a/debian/local/dexconf b/debian/local/dexconf
index a9df655..25d20a8 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -196,7 +196,6 @@ cat >&4 <<SECTION
Section "InputDevice"
Identifier "Generic Keyboard"
Driver "kbd"
- Option "CoreKeyboard"
Option "XkbRules" "$XKB_RULES"
Option "XkbModel" "$XKB_MODEL"
Option "XkbLayout" "$XKB_LAYOUT"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
