X Strike Force X.Org X11 SVN commit: r1795 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-15 11:57:38 -0400 (Sat, 15 Apr 2006)
New Revision: 1795
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* Better document what can be done in the event that x11-common isn't empty
on upgrade. Tell people in the error message that they can move the items
there back after the installation has finished.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-15 15:55:09 UTC (rev 1794)
+++ trunk/debian/xorg/debian/changelog 2006-04-15 15:57:38 UTC (rev 1795)
@@ -5,8 +5,11 @@
(closes: #322659, #362060,#362253)
* Update list of x11-common conflicts. Thanks Steve Langasek.
(closes: #362711)
+ * Better document what can be done in the event that x11-common isn't empty
+ on upgrade. Tell people in the error message that they can move the items
+ there back after the installation has finished.
- -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 11:55:13 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 11:57:01 -0400
xorg (1:7.0.11) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-15 15:55:09 UTC (rev 1794)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-15 15:57:38 UTC (rev 1795)
@@ -51,7 +51,7 @@
fi
if [ -d "/usr/X11R6/bin" ]; then
- rmdir "/usr/X11R6/bin" || die "Could not remove /usr/X11R6/bin. Is not yet empty"
+ rmdir "/usr/X11R6/bin" || die "Could not remove /usr/X11R6/bin. Is not yet empty. Please remove any items still in the directory. You can move them back after the install has completed successfully."
ln -s /usr/bin /usr/X11R6/bin || die "Could not link /usr/bin to /usr/X11R6/bin"
fi
Reply to: