This commit seems likely to break upgrades from stable. Nothing will guarantee that x11-common will be upgraded before everything else that uses /usr/X11R6/bin in stable. X Strike Force SVN Repository Admin wrote: > Author: dnusinow > Date: 2006-04-13 20:18:48 -0400 (Thu, 13 Apr 2006) > New Revision: 1772 > > Modified: > trunk/debian/xorg/debian/changelog > trunk/debian/xorg/debian/x11-common.postinst.in > Log: > * Symlink /usr/X11R6/bin to /usr/bin in x11-common.postinst. Thanks Steve > Langasek. > > Modified: trunk/debian/xorg/debian/changelog > =================================================================== > --- trunk/debian/xorg/debian/changelog 2006-04-14 00:08:43 UTC (rev 1771) > +++ trunk/debian/xorg/debian/changelog 2006-04-14 00:18:48 UTC (rev 1772) > @@ -17,8 +17,10 @@ > install to /usr/X11R6/bin, but they need to be removed from the system > first so that we can set up the symlink and not drop them out of the path. > Thanks Steve Langasek. (closes: #362524) > + * Symlink /usr/X11R6/bin to /usr/bin in x11-common.postinst. Thanks Steve > + Langasek. > > - -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 20:05:57 -0400 > + -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 20:18:25 -0400 > > xorg (1:7.0.10) unstable; urgency=low > > > Modified: trunk/debian/xorg/debian/x11-common.postinst.in > =================================================================== > --- trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-14 00:08:43 UTC (rev 1771) > +++ trunk/debian/xorg/debian/x11-common.postinst.in 2006-04-14 00:18:48 UTC (rev 1772) > @@ -50,6 +50,11 @@ > fi > fi > > +if [ -d "/usr/X11R6/bin" ]; then > + rmdir "/usr/X11R6/bin" || die "Could not remove /usr/X11R6/bin. Is not yet empty" > + ln -s /usr/bin /usr/X11R6/bin || die "Could not link /usr/bin to /usr/X11R6/bin" > +fi > + > # only mess with config file it exists; otherwise, assume that's the way the > # user wants it, but only if upgrading > if [ -e "$XWRAPPER_CONFIG" ] || [ -z "$UPGRADE" ]; then > > > -- > To UNSUBSCRIBE, email to debian-x-REQUEST@lists.debian.org > with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org > -- see shy jo
Attachment:
signature.asc
Description: Digital signature