summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 44996ca79..d0b11f074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ openssh (1:4.6p1-6) UNRELEASED; urgency=low
9 metapackage is not installed. 9 metapackage is not installed.
10 * Fix sshd/inittab advice in README.Debian to account for rc.d movement 10 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
11 (closes: #450632). 11 (closes: #450632).
12 * Suppress error from debian/rules if lsb-release is not installed.
12 * debconf template translations: 13 * debconf template translations:
13 - Add Slovak (thanks, Ivan Masár; closes: #441690). 14 - Add Slovak (thanks, Ivan Masár; closes: #441690).
14 - Update Brazilian Portuguese (thanks, Eder L. Marques; 15 - Update Brazilian Portuguese (thanks, Eder L. Marques;
diff --git a/debian/rules b/debian/rules
index 926e8674e..5a1d722fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ endif
73# Change the version string to include the Debian version 73# Change the version string to include the Debian version
74SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') 74SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
75 75
76DISTRIBUTOR := $(shell lsb_release -is || echo Debian) 76DISTRIBUTOR := $(shell lsb_release -is 2>/dev/null || echo Debian)
77ifeq ($(DISTRIBUTOR),Ubuntu) 77ifeq ($(DISTRIBUTOR),Ubuntu)
78DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games 78DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
79else 79else