X Strike Force X.Org X11 SVN commit: r1812 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-04-15 20:01:23 -0400 (Sat, 15 Apr 2006)
New Revision: 1812
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.postinst.in
Log:
* Fix shell snippet that provides the /usr/X11R6/bin dir->symlink
transition. This prevents the test from succeeding incorrectly.
Thanks Steve Langasek.
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-04-15 23:53:37 UTC (rev 1811)
+++ trunk/debian/xorg/debian/changelog 2006-04-16 00:01:23 UTC (rev 1812)
@@ -1,3 +1,11 @@
+xorg (1:7.0.13) unstable; urgency=low
+
+ * Fix shell snippet that provides the /usr/X11R6/bin dir->symlink
+ transition. This prevents the test from succeeding incorrectly.
+ Thanks Steve Langasek.
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 15 Apr 2006 20:00:57 -0400
+
xorg (1:7.0.12) unstable; urgency=low
* Move hardware autodetection stuff to Recommends rather than Depends.
Modified: trunk/debian/xorg/debian/x11-common.postinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-15 23:53:37 UTC (rev 1811)
+++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-16 00:01:23 UTC (rev 1812)
@@ -50,7 +50,7 @@
fi
fi
-if [ ! -L -e -d "/usr/X11R6/bin" ]; then
+if [ -d "/usr/X11R6/bin" ] && [ ! -L /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
Reply to: