summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2018-11-15 15:57:15 +0000
committerColin Watson <cjwatson@debian.org>2018-11-15 15:57:15 +0000
commit857ee5cbe73fcd5fccc9d06aa4c0307f523ce57c (patch)
tree46556c5489c830ffa5886fbeaae48705d8b4dc84 /debian
parentf5b06964c312a13fcb79a3bc0d2a223281a74810 (diff)
Fix Ubuntu detection in debian/rules
The documentation comment for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see #913816).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rwxr-xr-xdebian/rules2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 77bc6f6f2..3d4e5b85a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1openssh (1:7.9p1-4) UNRELEASED; urgency=medium
2
3 * Fix Ubuntu detection in debian/rules, since the documentation comment
4 for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see
5 #913816).
6
7 -- Colin Watson <cjwatson@debian.org> Thu, 15 Nov 2018 15:49:52 +0000
8
1openssh (1:7.9p1-3) unstable; urgency=medium 9openssh (1:7.9p1-3) unstable; urgency=medium
2 10
3 * Be more specific about what files to install in openssh-tests, to avoid 11 * 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
35# Change the version string to reflect distribution 35# Change the version string to reflect distribution
36SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//') 36SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//')
37 37
38UBUNTU := $(call dpkg_vendor_derives_from Ubuntu) 38UBUNTU := $(shell dpkg-vendor --derives-from Ubuntu && echo yes || echo no)
39ifeq ($(UBUNTU),yes) 39ifeq ($(UBUNTU),yes)
40DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games 40DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
41else 41else