X Strike Force X.Org X11 SVN commit: r3948 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-11-05 20:10:31 -0500 (Sun, 05 Nov 2006)
New Revision: 3948
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.postinst.in
Log:
* Update xserver-xorg.postinst.in commentary to be more accurate
* Prepare changelog for upload
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-11-05 13:51:58 UTC (rev 3947)
+++ trunk/debian/xorg/debian/changelog 2006-11-06 01:10:31 UTC (rev 3948)
@@ -1,4 +1,4 @@
-xorg (1:7.1.0-6) UNRELEASED; urgency=low
+xorg (1:7.1.0-6) unstable; urgency=low
[ Debconf translations added ]
* Arabic (though still incomplete).
@@ -22,7 +22,7 @@
* Bump x11-common's conflict on xlbiff to "<< 4.1-4". Thanks to Bill
Allombert and Steve Langasek (closes: #396279).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 4 Nov 2006 06:30:41 +0100
+ -- David Nusinow <dnusinow@debian.org> Sun, 5 Nov 2006 20:09:29 -0500
xorg (1:7.1.0-5) unstable; urgency=low
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-11-05 13:51:58 UTC (rev 3947)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-11-06 01:10:31 UTC (rev 3948)
@@ -1967,7 +1967,8 @@
warn "not updating $SERVER_SYMLINK; file exists but is not a symlink"
fi
-# here's a novel concept: DON'T TOUCH THE CONFIG ON UPGRADES
+# 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
# compare the current and stored checksums; if they do not match, assume
# that's the way the user wants it. if we're reconfiguring, overwrite
Reply to: