X Strike Force X.Org X11 SVN commit: r1725 - branches/modular/debian/xorg/debian
Author: dnusinow
Date: 2006-04-08 12:34:03 -0500 (Sat, 08 Apr 2006)
New Revision: 1725
Modified:
branches/modular/debian/xorg/debian/changelog
branches/modular/debian/xorg/debian/xserver-xorg.postinst.in
Log:
* Force migration of symlink if it points to /bin/true. Thanks Sune Vuorela
for the bug report and Ari Pollak for the fix.
* Upload to unstable
Modified: branches/modular/debian/xorg/debian/changelog
===================================================================
--- branches/modular/debian/xorg/debian/changelog 2006-04-07 06:36:53 UTC (rev 1724)
+++ branches/modular/debian/xorg/debian/changelog 2006-04-08 17:34:03 UTC (rev 1725)
@@ -1,3 +1,11 @@
+xorg (1:7.0.10) unstable; urgency=low
+
+ * Force migration of symlink if it points to /bin/true. Thanks Sune Vuorela
+ for the bug report and Ari Pollak for the fix.
+ * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 8 Apr 2006 13:28:17 -0400
+
xorg (1:7.0.9) experimental; urgency=low
* Put the Xsession stuff back in to x11-common. Thanks Arjan Oosting.
Modified: branches/modular/debian/xorg/debian/xserver-xorg.postinst.in
===================================================================
--- branches/modular/debian/xorg/debian/xserver-xorg.postinst.in 2006-04-07 06:36:53 UTC (rev 1724)
+++ branches/modular/debian/xorg/debian/xserver-xorg.postinst.in 2006-04-08 17:34:03 UTC (rev 1725)
@@ -730,7 +730,8 @@
if [ -L "$SERVER_SYMLINK" ] || ! [ -e "$SERVER_SYMLINK" ]; then
# migrate from old symlinks.
if [ "$(readlink /etc/X11/X)" = "/usr/X11R6/bin/Xorg" ] || \
- [ "$(readlink /etc/X11/X)" = "/usr/bin/X11/Xorg" ]; then
+ [ "$(readlink /etc/X11/X)" = "/usr/bin/X11/Xorg" ] || \
+ [ "$(readlink /etc/X11/X)" = "/bin/true" ]; then
rm /etc/X11/X
ln -s $THIS_SERVER /etc/X11/X
fi
Reply to: