xorg: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/xserver-xorg.postinst.in | 26 ++++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 3c632ade0007e78bb8aca5184f4594600ee14271
Author: David Nusinow <dnusinow@debian.org>
Date: Thu Nov 15 22:20:59 2007 -0500
* Only cleaning out old junk on upgrade and after version compare
This currently includes deregistering old debconf questions and removing
server symlink cruft. Closes: #451426, #451425, #451439
diff --git a/debian/changelog b/debian/changelog
index 3cc0dc2..3f6af13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.3+6) unstable; urgency=low
+
+ * Only cleaning out old junk on upgrade and after version compare
+ This currently includes deregistering old debconf questions and removing
+ server symlink cruft. Closes: #451426, #451425, #451439
+
+ -- David Nusinow <dnusinow@debian.org> Thu, 15 Nov 2007 20:38:44 -0500
+
xorg (1:7.3+5) unstable; urgency=low
[ David Nusinow ]
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 12f25a6..b46e186 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1748,18 +1748,20 @@ else
debug_echo "not updating $XORGCONFIG; we're upgrading"
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
+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/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
+fi
exit 0
Reply to: