diff options
author | Colin Watson <cjwatson@debian.org> | 2011-07-29 14:27:43 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-07-29 14:27:43 +0100 |
commit | 720d8309aa73b4ace915ea972203a76b65b3e782 (patch) | |
tree | a92812f0665ee59b4e28ebd929abdcd9fc03ab55 /debian | |
parent | a8c854c8ff341b1b41a7fdd9274e68d1e444b245 (diff) |
Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
Ubuntu itself.
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 3 | ||||
-rwxr-xr-x | debian/rules | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 5c8edd737..8c9deaf37 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,9 @@ | |||
1 | openssh (1:5.8p1-7) UNRELEASED; urgency=low | 1 | openssh (1:5.8p1-7) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * Only recommend ssh-import-id when built on Ubuntu (closes: #635887). | 3 | * Only recommend ssh-import-id when built on Ubuntu (closes: #635887). |
4 | * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather | ||
5 | than 'lsb_release -is' so that Ubuntu derivatives behave the same way as | ||
6 | Ubuntu itself. | ||
4 | 7 | ||
5 | -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 13:51:26 +0100 | 8 | -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 13:51:26 +0100 |
6 | 9 | ||
diff --git a/debian/rules b/debian/rules index 9731c320b..eb895e0c3 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -58,7 +58,7 @@ endif | |||
58 | # Change the version string to include the Debian version | 58 | # Change the version string to include the Debian version |
59 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | 59 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') |
60 | 60 | ||
61 | DISTRIBUTOR := $(shell lsb_release -is 2>/dev/null || echo Debian) | 61 | DISTRIBUTOR := $(shell dpkg-vendor --derives-from Ubuntu 2>/dev/null && echo Ubuntu) |
62 | ifeq ($(DISTRIBUTOR),Ubuntu) | 62 | ifeq ($(DISTRIBUTOR),Ubuntu) |
63 | DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games | 63 | DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games |
64 | else | 64 | else |