From 5bc99a0f87385a5628a67b6b4e518cdcc45f68bd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 29 Mar 2010 09:50:45 +0100 Subject: Hardcode the location of xauth to /usr/bin/xauth rather than /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440). xauth no longer depends on x11-common, so we're no longer guaranteed to have the /usr/bin/X11 symlink available. I was taking advantage of the /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far enough in the past now that it's probably safe to just use /usr/bin. --- debian/changelog | 6 ++++++ debian/rules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a98e9d638..d349e6ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,12 @@ openssh (1:5.3p1-4) UNRELEASED; urgency=low versions of ssh-krb5 are no longer security-supported by Debian I don't think there's any point keeping client compatibility for them. * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4. + * Hardcode the location of xauth to /usr/bin/xauth rather than + /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440). + xauth no longer depends on x11-common, so we're no longer guaranteed to + have the /usr/bin/X11 symlink available. I was taking advantage of the + /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far + enough in the past now that it's probably safe to just use /usr/bin. -- Colin Watson Mon, 01 Mar 2010 12:24:41 +0000 diff --git a/debian/rules b/debian/rules index 2101c97ee..ba78595af 100755 --- a/debian/rules +++ b/debian/rules @@ -97,7 +97,7 @@ confflags += --with-selinux endif # The deb build wants xauth; the udeb build doesn't. -confflags += --with-xauth=/usr/bin/X11/xauth +confflags += --with-xauth=/usr/bin/xauth confflags_udeb += --without-xauth # Default paths. The udeb build has /usr/bin/X11 and /usr/games removed. -- cgit v1.2.3