X Strike Force X.Org X11 SVN commit: r3853 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-10-19 22:43:02 -0400 (Thu, 19 Oct 2006)
New Revision: 3853
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/xserver-xorg.postinst.in
trunk/debian/xorg/debian/xserver-xorg.preinst.in
Log:
* Fix server symlink md5sum for upgrades from sarge. It now takes links to
the XFree86 server and /bin/true in case of botched old symlink
transition in to account.
* Remove server symlink md5sum recreation in preinst. This gets taken care
of in the postinst, and having it the preinst can cause upgrade problems
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-10-18 06:30:18 UTC (rev 3852)
+++ trunk/debian/xorg/debian/changelog 2006-10-20 02:43:02 UTC (rev 3853)
@@ -6,8 +6,15 @@
[ Debconf translation updates ]
* Vietnamese. Closes: #393640
- -- Christian Perrier <bubulle@debian.org> Tue, 17 Oct 2006 20:03:26 +0200
+ [ David Nusinow ]
+ * Fix server symlink md5sum for upgrades from sarge. It now takes links to
+ the XFree86 server and /bin/true in case of botched old symlink
+ transition in to account.
+ * Remove server symlink md5sum recreation in preinst. This gets taken care
+ of in the postinst, and having it the preinst can cause upgrade problems
+ -- David Nusinow <dnusinow@debian.org> Thu, 19 Oct 2006 22:35:37 -0400
+
xorg (1:7.1.0-4) unstable; urgency=low
[ Debconf translation updates ]
Modified: trunk/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-18 06:30:18 UTC (rev 3852)
+++ trunk/debian/xorg/debian/xserver-xorg.postinst.in 2006-10-20 02:43:02 UTC (rev 3853)
@@ -1929,6 +1929,10 @@
"$(cat "$SERVER_SYMLINK_CHECKSUM")" ] || \
[ "$(echo "/usr/bin/X11/Xorg" | md5sum)" = \
"$(cat "$SERVER_SYMLINK_CHECKSUM")" ] || \
+ [ "$(echo "/usr/bin/X11/XFree86" | md5sum)" = \
+ "$(cat "$SERVER_SYMLINK_CHECKSUM")" ] || \
+ [ "$(echo "/bin/true" | md5sum)" = \
+ "$(cat "$SERVER_SYMLINK_CHECKSUM")" ] || \
! [ -e "$SERVER_SYMLINK" ]; then
# finally, only update the symlink if this package contains the
# selected default X server.
Modified: trunk/debian/xorg/debian/xserver-xorg.preinst.in
===================================================================
--- trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-10-18 06:30:18 UTC (rev 3852)
+++ trunk/debian/xorg/debian/xserver-xorg.preinst.in 2006-10-20 02:43:02 UTC (rev 3853)
@@ -41,15 +41,6 @@
fi
done
- # If this checksum got removed on upgrade for some reason, re-add it
- if ! [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
- message "Server symlink checksum doesn't exist. We need to make it"
- if [ -L "$SERVER_SYMLINK" ] ; then
- message "Re-adding lost server symlink checksum"
- readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
- fi
- fi
-
# the transition from /var/lib/xfree86 to /var/lib/x11 occurred in
# 7.0.0-0ubuntu1 and 1:7.0.0
if [ -n "$2" ] && \
Reply to: