summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules8
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b0e27201..42f4e0ccc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ openssh (1:6.5p1-1) UNRELEASED; urgency=medium
20 Daniel Kahn Gillmor; closes: #732441). 20 Daniel Kahn Gillmor; closes: #732441).
21 * Add the pam_keyinit session module, to create a new session keyring on 21 * Add the pam_keyinit session module, to create a new session keyring on
22 login (closes: #734816). 22 login (closes: #734816).
23 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
24 /usr/bin/X11 (closes: #644521).
23 25
24 -- Colin Watson <cjwatson@debian.org> Sun, 09 Feb 2014 15:52:14 +0000 26 -- Colin Watson <cjwatson@debian.org> Sun, 09 Feb 2014 15:52:14 +0000
25 27
diff --git a/debian/rules b/debian/rules
index 1b1e2d456..5b0d8f9d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,11 +47,11 @@ SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^V
47 47
48DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi) 48DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
49ifeq ($(DISTRIBUTOR),Ubuntu) 49ifeq ($(DISTRIBUTOR),Ubuntu)
50DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games 50DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
51else 51else
52DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games 52DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/games
53endif 53endif
54SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11 54SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
55 55
56ifeq ($(DISTRIBUTOR),Ubuntu) 56ifeq ($(DISTRIBUTOR),Ubuntu)
57server_recommends := ssh-import-id 57server_recommends := ssh-import-id
@@ -93,7 +93,7 @@ endif
93confflags += --with-xauth=/usr/bin/xauth 93confflags += --with-xauth=/usr/bin/xauth
94confflags_udeb += --without-xauth 94confflags_udeb += --without-xauth
95 95
96# Default paths. The udeb build has /usr/bin/X11 and /usr/games removed. 96# Default paths. The udeb build has /usr/games removed.
97confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH) 97confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH)
98confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin 98confflags_udeb += --with-default-path=/usr/local/bin:/usr/bin:/bin --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
99 99