From 857ee5cbe73fcd5fccc9d06aa4c0307f523ce57c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 15 Nov 2018 15:57:15 +0000 Subject: Fix Ubuntu detection in debian/rules The documentation comment for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see #913816). --- debian/changelog | 8 ++++++++ debian/rules | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77bc6f6f2..3d4e5b85a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +openssh (1:7.9p1-4) UNRELEASED; urgency=medium + + * Fix Ubuntu detection in debian/rules, since the documentation comment + for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see + #913816). + + -- Colin Watson Thu, 15 Nov 2018 15:49:52 +0000 + openssh (1:7.9p1-3) unstable; urgency=medium * Be more specific about what files to install in openssh-tests, to avoid diff --git a/debian/rules b/debian/rules index 24f1683dc..94d84fd04 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ endif # Change the version string to reflect distribution SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//') -UBUNTU := $(call dpkg_vendor_derives_from Ubuntu) +UBUNTU := $(shell dpkg-vendor --derives-from Ubuntu && echo yes || echo no) ifeq ($(UBUNTU),yes) DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games else -- cgit v1.2.3