X Strike Force X.Org X11 SVN commit: r1802 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-15 12:29:21 -0400 (Sat, 15 Apr 2006)
New Revision: 1802
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
Log:
and Christian Hammers. Thanks to Steve Langasek for the fix.
* Have safer and better logic for replacing the /usr/X11R6/bin dir with a
symlink. Handle new installs. Thanks Bart Vanhaute. (closes: #362780)
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-15 16:22:53 UTC (rev 1801)
+++ trunk/debian/xorg/debian/changelog 2006-04-15 16:29:21 UTC (rev 1802)
@@ -13,12 +13,14 @@
Xin. (closes: #362719, #362720, #362694)
* Remove the /usr/X11R6/bin/X symlink from xserver-xorg. Also bump the
x11-common conflicts with xserver-xorg to this version. Thanks Joey Hess
- and Christian Hammers. Thanks to Steve Langasek for the fix.
+ and Christian Hammers. Thanks to Steve Langasek for the fix.
(closes: #362713, #362672)
* Add pgaccess to the list of packages to conflict with. Thanks Bas
Couwenberg. (closes: #362685)
+ * Have safer and better logic for replacing the /usr/X11R6/bin dir with a
+ symlink. Handle new installs. Thanks Bart Vanhaute. (closes: #362780)
- -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 12:21:18 -0400
+ -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 12:29: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 16:22:53 UTC (rev 1801)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-15 16:29:21 UTC (rev 1802)
@@ -50,8 +50,10 @@
fi
fi
-if [ -d "/usr/X11R6/bin" ]; then
+if [ ! -L -e -d "/usr/X11R6/bin" ]; then
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."
+fi
+if ! [ -e "/usr/X11R6/bin" ]; then
ln -s /usr/bin /usr/X11R6/bin || die "Could not link /usr/bin to /usr/X11R6/bin"
fi
Reply to: