From 720d8309aa73b4ace915ea972203a76b65b3e782 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 29 Jul 2011 14:27:43 +0100 Subject: 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. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5c8edd737..8c9deaf37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ openssh (1:5.8p1-7) UNRELEASED; urgency=low * Only recommend ssh-import-id when built on Ubuntu (closes: #635887). + * 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. -- Colin Watson Fri, 29 Jul 2011 13:51:26 +0100 diff --git a/debian/rules b/debian/rules index 9731c320b..eb895e0c3 100755 --- a/debian/rules +++ b/debian/rules @@ -58,7 +58,7 @@ endif # Change the version string to include the Debian version SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') -DISTRIBUTOR := $(shell lsb_release -is 2>/dev/null || echo Debian) +DISTRIBUTOR := $(shell dpkg-vendor --derives-from Ubuntu 2>/dev/null && echo Ubuntu) ifeq ($(DISTRIBUTOR),Ubuntu) DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games else -- cgit v1.2.3