summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules2
2 files changed, 7 insertions, 1 deletions
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
11 versions of ssh-krb5 are no longer security-supported by Debian I don't 11 versions of ssh-krb5 are no longer security-supported by Debian I don't
12 think there's any point keeping client compatibility for them. 12 think there's any point keeping client compatibility for them.
13 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4. 13 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
14 * Hardcode the location of xauth to /usr/bin/xauth rather than
15 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
16 xauth no longer depends on x11-common, so we're no longer guaranteed to
17 have the /usr/bin/X11 symlink available. I was taking advantage of the
18 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
19 enough in the past now that it's probably safe to just use /usr/bin.
14 20
15 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000 21 -- Colin Watson <cjwatson@debian.org> Mon, 01 Mar 2010 12:24:41 +0000
16 22
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
97endif 97endif
98 98
99# The deb build wants xauth; the udeb build doesn't. 99# The deb build wants xauth; the udeb build doesn't.
100confflags += --with-xauth=/usr/bin/X11/xauth 100confflags += --with-xauth=/usr/bin/xauth
101confflags_udeb += --without-xauth 101confflags_udeb += --without-xauth
102 102
103# Default paths. The udeb build has /usr/bin/X11 and /usr/games removed. 103# Default paths. The udeb build has /usr/bin/X11 and /usr/games removed.