xorg: Changes to 'debian-unstable'
debian/changelog | 9 ++++++
debian/xserver-xorg.postinst.in | 55 +++++++++++++++++++++-------------------
2 files changed, 38 insertions(+), 26 deletions(-)
New commits:
commit 5db2bb10c2724a393fcba71e0e31eb87e747df45
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Dec 18 00:08:50 2007 +0100
Don't try to interact with debconf after db_stop.
Deregister old debconf questions before calling dexconf. dexconf calls
db_stop, and we can't use debconf after that. Add a comment to that
effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
to prevent future mistakes. Thanks, Michael Vogt!
diff --git a/debian/changelog b/debian/changelog
index fcb2bab..0f8611d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.3+9) UNRELEASED; urgency=low
+
+ * Deregister old debconf questions before calling dexconf. dexconf calls
+ db_stop, and we can't use debconf after that. Add a comment to that
+ effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
+ to prevent future mistakes. Thanks, Michael Vogt!
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 17 Dec 2007 23:21:35 +0100
+
xorg (1:7.3+8) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index abb9e20..83ac0b4 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1064,6 +1064,35 @@ elif [ `readlink "$SERVER_SYMLINK"` = "/bin/true" ]; then
ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
fi
+if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
+ # 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/autodetect_monitor" \
+ "xserver-xorg/config/monitor/selection-method" \
+ "xserver-xorg/config/monitor/screen-size" \
+ "xserver-xorg/config/monitor/mode-list" \
+ "xserver-xorg/config/monitor/default-identifier" \
+ "xserver-xorg/config/monitor/horiz-sync" \
+ "xserver-xorg/config/monitor/vert-refresh" \
+ "xserver-xorg/config/monitor/range_input_error" \
+ "xserver-xorg/config/display/modes" \
+ "xserver-xorg/config/device/video_ram" \
+ "xserver-xorg/config/display/default_depth" \
+ "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
+fi
+
+# no debconf interaction should be done after this point
+# (the dexconf call below invokes db_stop)
+
# Don't touch the config on upgrades except to deal with known issues with old
# configs.
if [ -z "$UPGRADE" ] || dpkg --compare-versions "$2" le "1:7.0.14"; then
@@ -1141,32 +1170,6 @@ else
debug_echo "not updating $XORGCONFIG; we're upgrading"
fi
-if [ -n "$UPGRADE" ] && dpkg --compare-versions "$2" le "1:7.3+5"; then
- # 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/autodetect_monitor" \
- "xserver-xorg/config/monitor/selection-method" \
- "xserver-xorg/config/monitor/screen-size" \
- "xserver-xorg/config/monitor/mode-list" \
- "xserver-xorg/config/monitor/default-identifier" \
- "xserver-xorg/config/monitor/horiz-sync" \
- "xserver-xorg/config/monitor/vert-refresh" \
- "xserver-xorg/config/monitor/range_input_error" \
- "xserver-xorg/config/display/modes" \
- "xserver-xorg/config/device/video_ram" \
- "xserver-xorg/config/display/default_depth" \
- "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
-fi
-
exit 0
# vim:set ai et sts=2 sw=2 tw=0:
Reply to: